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