merge

include/mitsuba/core/constants.h

@@ -21,13 +21,8 @@
 
 /* Choice of precision */
 #ifdef DOUBLE_PRECISION
-#define Float double
 #define Epsilon 1e-6
 #else
-#ifndef SINGLE_PRECISION
-#define SINGLE_PRECISION
-#endif
-#define Float float
 #define Epsilon 1e-4f
 #endif
 

include/mitsuba/mitsuba.h

@@ -38,6 +38,14 @@ using std::cout;
 using std::cerr;
 using std::endl;
 
+#if defined(DOUBLE_PRECISION)
+typedef double Float;
+#elif defined(SINGLE_PRECISION)
+typedef float Float;
+#else
+#error No precision flag was defined!
+#endif
+
 /**
  * Include a basic subset of the core classes
  */

src/shapes/ply/ply.cpp

@@ -24,16 +24,7 @@
 #include <ply/ply_parser.hpp>
 
 #if MTS_USE_BOOST_TR1
-#  if defined(Float)
-#    define MTS_Float
-#    pragma push_macro("Float")
-#    undef Float
-#  endif
 #include <boost/tr1/functional.hpp>
-#  if defined(MTS_Float)
-#    pragma pop_macro("Float")
-#    undef MTS_Float
-#  endif
 #else
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
 #include <functional>

src/shapes/ply/ply/ply_parser.hpp

@@ -30,18 +30,9 @@
 #endif
 
 #if MTS_USE_BOOST_TR1
-#  if defined(Float)
-#    define MTS_Float
-#    pragma push_macro("Float")
-#    undef Float
-#  endif
 #include <boost/tr1/functional.hpp>
 #include <boost/tr1/memory.hpp>
 #include <boost/tr1/tuple.hpp>
-#  if defined(MTS_Float)
-#    pragma pop_macro("Float")
-#    undef MTS_Float
-#  endif
 #else
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
 #include <functional>