aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/CXX11/Core
diff options
context:
space:
mode:
Diffstat (limited to 'unsupported/Eigen/CXX11/Core')
-rw-r--r--unsupported/Eigen/CXX11/Core15
1 files changed, 11 insertions, 4 deletions
diff --git a/unsupported/Eigen/CXX11/Core b/unsupported/Eigen/CXX11/Core
index 4dc4ab224..292f09564 100644
--- a/unsupported/Eigen/CXX11/Core
+++ b/unsupported/Eigen/CXX11/Core
@@ -2,6 +2,7 @@
// for linear algebra.
//
// Copyright (C) 2013 Christian Seiler <christian@iwakd.de>
+// Copyright (C) 2014 Benoit Steiner <benoit.steiner.goog@gmail.com>
//
// This Source Code Form is subject to the terms of the Mozilla
// Public License v. 2.0. If a copy of the MPL was not distributed
@@ -21,20 +22,26 @@
* module. Note that at this stage, you should not need to include
* this module directly.
*
+ * It also provides a limited fallback for compilers that don't support
+ * CXX11 yet, such as nvcc.
+ *
* \code
* #include <Eigen/CXX11/Core>
* \endcode
*/
-#include <array>
+#include <vector>
+// Emulate the cxx11 functionality that we need if the compiler doesn't support it.
+#if __cplusplus <= 199711L
+#include "src/Core/util/EmulateCXX11Meta.h"
+#else
+#include <array>
#include "src/Core/util/CXX11Workarounds.h"
#include "src/Core/util/CXX11Meta.h"
+#endif
#include <Eigen/src/Core/util/ReenableStupidWarnings.h>
#endif // EIGEN_CXX11_CORE_MODULE
-/*
- * kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle;
- */