|
Alec Leamas |
57a0aac |
diff --git a/adobe/cmath.hpp b/adobe/cmath.hpp
|
|
Alec Leamas |
57a0aac |
index 733c299..e671f7c 100644
|
|
Alec Leamas |
57a0aac |
--- a/adobe/cmath.hpp
|
|
Alec Leamas |
57a0aac |
+++ b/adobe/cmath.hpp
|
|
Alec Leamas |
57a0aac |
@@ -37,18 +37,9 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
|
|
Alec Leamas |
57a0aac |
#define ADOBE_HAS_CPP_CMATH
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
#elif __GNUC__ == 4
|
|
Alec Leamas |
57a0aac |
-#if (__GNUC_MINOR__ <= 7) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
|
|
Alec Leamas |
57a0aac |
-// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
|
|
Alec Leamas |
57a0aac |
-/*
|
|
Alec Leamas |
57a0aac |
- The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
|
|
Alec Leamas |
57a0aac |
-*/
|
|
Alec Leamas |
57a0aac |
-#define ADOBE_HAS_C99_MATH_H
|
|
Alec Leamas |
57a0aac |
-#include <cmath>
|
|
Alec Leamas |
57a0aac |
-#else
|
|
Alec Leamas |
57a0aac |
-#include <tr1/cmath>
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
#define ADOBE_HAS_C99_STD_MATH_H
|
|
Alec Leamas |
57a0aac |
-#endif
|
|
Alec Leamas |
57a0aac |
+#include <tr1/cmath>
|
|
Alec Leamas |
57a0aac |
#endif
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
#elif defined(_MSC_VER)
|
|
Alec Leamas |
57a0aac |
@@ -73,12 +64,12 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
namespace adobe {
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
-using std::float_t;
|
|
Alec Leamas |
57a0aac |
-using std::double_t;
|
|
Alec Leamas |
57a0aac |
+using std::tr1::float_t;
|
|
Alec Leamas |
57a0aac |
+using std::tr1::double_t;
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
-using std::round;
|
|
Alec Leamas |
57a0aac |
-using std::lround;
|
|
Alec Leamas |
57a0aac |
-using std::trunc;
|
|
Alec Leamas |
57a0aac |
+using std::tr1::round;
|
|
Alec Leamas |
57a0aac |
+using std::tr1::lround;
|
|
Alec Leamas |
57a0aac |
+using std::tr1::trunc;
|
|
Alec Leamas |
57a0aac |
|
|
Alec Leamas |
57a0aac |
} // namespace adobe
|
|
Alec Leamas |
57a0aac |
|