|
Alec Leamas |
1575355 |
asl-gcc-4.6
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
From: Alec Leamas <leamas.alec@gmail.com>
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
Fixes to for gcc 4.6 - 4.7.
|
|
Alec Leamas |
1575355 |
---
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
adobe/cmath.hpp | 4 ++--
|
|
Alec Leamas |
1575355 |
source/any_regular.cpp | 2 +-
|
|
Alec Leamas |
1575355 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
diff --git a/adobe/cmath.hpp b/adobe_source_libraries/adobe/cmath.hpp
|
|
Alec Leamas |
1575355 |
index 250a3ef..733c299 100644
|
|
Alec Leamas |
1575355 |
--- a/adobe/cmath.hpp
|
|
Alec Leamas |
1575355 |
+++ b/adobe/cmath.hpp
|
|
Alec Leamas |
1575355 |
@@ -37,7 +37,7 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
|
|
Alec Leamas |
1575355 |
#define ADOBE_HAS_CPP_CMATH
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
#elif __GNUC__ == 4
|
|
Alec Leamas |
1575355 |
-#if (__GNUC_MINOR__ < 6) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
|
|
Alec Leamas |
1575355 |
+#if (__GNUC_MINOR__ <= 7) || (!(defined(_GLIBCXX_USE_C99_MATH_TR1)))
|
|
Alec Leamas |
1575355 |
// at least Ubuntu 9.x, gcc 4.4.1, still falls into this case
|
|
Alec Leamas |
1575355 |
/*
|
|
Alec Leamas |
1575355 |
The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
|
|
Alec Leamas |
1575355 |
@@ -46,7 +46,7 @@ back to include math.h. This also needs to add any other C99 math.h extensions.
|
|
Alec Leamas |
1575355 |
#include <cmath>
|
|
Alec Leamas |
1575355 |
#else
|
|
Alec Leamas |
1575355 |
#include <tr1/cmath>
|
|
Alec Leamas |
1575355 |
-s
|
|
Alec Leamas |
1575355 |
+
|
|
Alec Leamas |
1575355 |
#define ADOBE_HAS_C99_STD_MATH_H
|
|
Alec Leamas |
1575355 |
#endif
|
|
Alec Leamas |
1575355 |
#endif
|
|
Alec Leamas |
1575355 |
diff --git a/source/any_regular.cpp b/adobe_source_libraries/source/any_regular.cpp
|
|
Alec Leamas |
1575355 |
index b0826ba..2f4f3fb 100644
|
|
Alec Leamas |
1575355 |
--- a/source/any_regular.cpp
|
|
Alec Leamas |
1575355 |
+++ b/source/any_regular.cpp
|
|
Alec Leamas |
1575355 |
@@ -62,7 +62,7 @@ template <typename T, typename Any = void>
|
|
Alec Leamas |
1575355 |
struct make_serializable { static const serializable<T> value; };
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
template <typename T, typename Any>
|
|
Alec Leamas |
1575355 |
-const serializable<T> make_serializable<T, Any>::value;
|
|
Alec Leamas |
1575355 |
+const serializable<T> make_serializable<T, Any>::value = serializable<T>();
|
|
Alec Leamas |
1575355 |
|
|
Alec Leamas |
1575355 |
/**************************************************************************************************/
|
|
Alec Leamas |
1575355 |
|