Merged latest update from trunk

This commit is contained in:
Benoit Steiner 2016-04-27 14:22:45 -07:00
commit 1a97fd8b4e
2 changed files with 4 additions and 0 deletions

View File

@ -11,6 +11,8 @@
//#ifndef EIGEN_CXX11_TENSOR_MODULE
//#define EIGEN_CXX11_TENSOR_MODULE
#include "../../../Eigen/Core"
#include <Eigen/src/Core/util/DisableStupidWarnings.h>
#include "src/util/CXX11Meta.h"

View File

@ -10,6 +10,8 @@
#ifndef EIGEN_CXX11_THREADPOOL_MODULE
#define EIGEN_CXX11_THREADPOOL_MODULE
#include "../../../Eigen/Core"
#include <Eigen/src/Core/util/DisableStupidWarnings.h>
/** \defgroup CXX11_ThreadPool_Module C++11 ThreadPool Module