From a65684b04991266554405deb4f0f65cfc3887443 Mon Sep 17 00:00:00 2001
From: hindsights <kkcmp@163.com>
Date: Tue, 19 Dec 2017 17:38:53 +0800
Subject: [PATCH 1/2] fix subscript error in multithreaded_srl

---
 src/console/srl_cmdline.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/console/srl_cmdline.cpp b/src/console/srl_cmdline.cpp
index 8ab29337f..883fc0f71 100644
--- a/src/console/srl_cmdline.cpp
+++ b/src/console/srl_cmdline.cpp
@@ -67,7 +67,7 @@ void multithreaded_srl(void *args) {
     for (int k = 0; k < vecSRLResult.size(); ++k) {
       is_pred[vecSRLResult[k].first] = true;
       for (int j = 0; j < vecSRLResult[k].second.size(); ++j) {
-        arg[findRoot(parse, vecSRLResult[k].second[j].second)][k] = vecSRLResult[k].second[k].first;
+        arg[findRoot(parse, vecSRLResult[k].second[j].second)][k] = vecSRLResult[k].second[j].first;
       }
     }
 

From 254a3756f2fb6985e4aff44443c58a1c5020c0c3 Mon Sep 17 00:00:00 2001
From: liu946 <liuyang570926881@gmail.com>
Date: Wed, 20 Dec 2017 15:21:52 +0800
Subject: [PATCH 2/2] merge from eigen update commit b93f96 'Made the
 TensorStorage class compile with clang 3.9'

---
 .../unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/thirdparty/eigen/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h b/thirdparty/eigen/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h
index f8121d17b..7ae087c7a 100644
--- a/thirdparty/eigen/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h
+++ b/thirdparty/eigen/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h
@@ -31,12 +31,12 @@ namespace Eigen {
   *
   * \sa Tensor
   */
-template<typename T, typename Dimensions, int Options_> class TensorStorage;
+template<typename T, typename Dimensions, int Options> class TensorStorage;
 
 
 // Pure fixed-size storage
-template<typename T, int Options_, typename FixedDimensions>
-class TensorStorage<T, FixedDimensions, Options_>
+template<typename T, typename FixedDimensions, int Options_>
+class TensorStorage
 {
  private:
   static const std::size_t Size = FixedDimensions::total_size;
@@ -66,7 +66,7 @@ class TensorStorage<T, FixedDimensions, Options_>
 
 
 // pure dynamic
-template<typename T, int Options_, typename IndexType, int NumIndices_>
+template<typename T, typename IndexType, int NumIndices_, int Options_>
 class TensorStorage<T, DSizes<IndexType, NumIndices_>, Options_>
 {
   public: