aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2017-02-10 14:27:43 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2017-02-10 14:27:43 -0800
commitfad776492ff337b3bc0884715c5f80c980ed63a7 (patch)
treeedd0e3b390be7c9738036a56db0d6b55f7adb437 /Eigen
parent769208a17ff15b94b6d8a20a6c00e2fdd7149edd (diff)
parent1ef30b8090ad56bac5d1b0553a2b0a894a77405e (diff)
Merged eigen/eigen into default
Diffstat (limited to 'Eigen')
-rw-r--r--Eigen/src/plugins/IndexedViewMethods.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Eigen/src/plugins/IndexedViewMethods.h b/Eigen/src/plugins/IndexedViewMethods.h
index 5e28ec71c..81e463623 100644
--- a/Eigen/src/plugins/IndexedViewMethods.h
+++ b/Eigen/src/plugins/IndexedViewMethods.h
@@ -7,7 +7,8 @@
// Public License v. 2.0. If a copy of the MPL was not distributed
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#if !defined(EIGEN_PARSED_BY_DOXYGEN) && EIGEN_HAS_INDEXED_VIEW
+#if EIGEN_HAS_INDEXED_VIEW
+#if !defined(EIGEN_PARSED_BY_DOXYGEN)
// This file is automatically included twice to generate const and non-const versions
@@ -256,4 +257,5 @@ template<typename Indices>
IndexedView_or_VectorBlock
operator()(const Indices& indices);
-#endif // EIGEN_PARSED_BY_DOXYGEN && EIGEN_HAS_INDEXED_VIEW
+#endif // EIGEN_PARSED_BY_DOXYGEN
+#endif // EIGEN_HAS_INDEXED_VIEW