[Boost-commit] svn:boost r49996 - trunk/boost/units

Subject: [Boost-commit] svn:boost r49996 - trunk/boost/units
From: steven_at_[hidden]
Date: 2008-11-28 13:20:08

Author: steven_watanabe
Date: 2008-11-28 13:20:07 EST (Fri, 28 Nov 2008)
New Revision: 49996
URL: http://svn.boost.org/trac/boost/changeset/49996

Log:
base_dimension/base_unit now work on Borland
Text files modified: 
   trunk/boost/units/base_dimension.hpp |     2 +-                                      
   trunk/boost/units/base_unit.hpp      |     2 +-                                      
   trunk/boost/units/config.hpp         |    20 +++++++++-----------                    
   3 files changed, 11 insertions(+), 13 deletions(-)

Modified: trunk/boost/units/base_dimension.hpp
==============================================================================
--- trunk/boost/units/base_dimension.hpp	(original)
+++ trunk/boost/units/base_dimension.hpp	2008-11-28 13:20:07 EST (Fri, 28 Nov 2008)
@@ -50,7 +50,7 @@
 /// to use the same value in multiple definitions.
 template<class Derived,
          long N
-#ifndef BOOST_UNITS_DOXYGEN
+#if !defined(BOOST_UNITS_DOXYGEN) && !defined(__BORLANDC__)
          ,
          class = typename detail::ordinal_has_already_been_defined<
              check_base_dimension<Derived, N>::value

Modified: trunk/boost/units/base_unit.hpp
==============================================================================
--- trunk/boost/units/base_unit.hpp	(original)
+++ trunk/boost/units/base_unit.hpp	2008-11-28 13:20:07 EST (Fri, 28 Nov 2008)
@@ -53,7 +53,7 @@
 template<class Derived,
          class Dim,
          long N
-#ifndef BOOST_UNITS_DOXYGEN
+#if !defined(BOOST_UNITS_DOXYGEN) && !defined(__BORLANDC__)
          ,
          class = typename detail::ordinal_has_already_been_defined<
              check_base_unit<Derived, N>::value

Modified: trunk/boost/units/config.hpp
==============================================================================
--- trunk/boost/units/config.hpp	(original)
+++ trunk/boost/units/config.hpp	2008-11-28 13:20:07 EST (Fri, 28 Nov 2008)
@@ -14,17 +14,15 @@
 #include <boost/config.hpp>
 #include <boost/version.hpp>
 
-#if (BOOST_VERSION >= 103400)
-    ///INTERNAL ONLY
-    #define BOOST_UNITS_HAS_BOOST_TYPEOF    1
-#else
-    ///INTERNAL ONLY
-    #define BOOST_UNITS_HAS_BOOST_TYPEOF    0
-#endif
-
-// uncomment this to test without Boost Typeof
-//#undef BOOST_UNITS_HAS_BOOST_TYPEOF
-//#define BOOST_UNITS_HAS_BOOST_TYPEOF      0   
+#ifndef BOOST_UNITS_HAS_BOOST_TYPEOF
+    #if (BOOST_VERSION >= 103400)
+        ///INTERNAL ONLY
+        #define BOOST_UNITS_HAS_BOOST_TYPEOF    1
+    #else
+        ///INTERNAL ONLY
+        #define BOOST_UNITS_HAS_BOOST_TYPEOF    0
+    #endif
+#endif 
 
 #if (BOOST_UNITS_HAS_BOOST_TYPEOF)
     #include <boost/typeof/typeof.hpp>