From 4458a6844ed951a06a3e5ef5cc89cd9da36baef4 Mon Sep 17 00:00:00 2001 From: Toon Knapen Date: Tue, 13 Jul 2004 07:05:16 +0000 Subject: [PATCH] make sure BOOST_UBLAS_USE_ET is not redefined if already defined svn path=/trunk/boost/boost/numeric/ublas/; revision=23478 --- include/boost/numeric/ublas/config.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/boost/numeric/ublas/config.hpp b/include/boost/numeric/ublas/config.hpp index 00b419d8..6cd57049 100644 --- a/include/boost/numeric/ublas/config.hpp +++ b/include/boost/numeric/ublas/config.hpp @@ -305,7 +305,9 @@ namespace std { #define BOOST_UBLAS_USE_FAST_SAME // Use expression templates. +#ifndef BOOST_UBLAS_USE_ET #define BOOST_UBLAS_USE_ET +#endif // BOOST_UBLAS_USE_ET // NO runtime error checks with BOOST_UBLAS_CHECK macro #ifndef BOOST_UBLAS_CHECK_ENABLE @@ -330,8 +332,10 @@ namespace std { #ifdef BOOST_MSVC // Use expression templates (otherwise we get many ICE's) +#ifndef BOOST_UBLAS_USE_ET #define BOOST_UBLAS_USE_ET -#endif +#endif // BOOST_UBLAS_USE_ET +#endif // BOOST_MSVC // Enable runtime error checks with BOOST_UBLAS_CHECK macro. Check bounds etc #ifndef BOOST_UBLAS_CHECK_ENABLE