From 78300f7d61fe3fc0e8dbfa3017c3eb18ccbc46ad Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 31 Jul 2016 11:06:51 +0100
Subject: [PATCH 1/2] Fixed build error reported on gcc 4.6.4/Ubuntu 12.04
 32bit, issue #108

---
 src/osgPlugins/osgjs/json_stream | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/osgPlugins/osgjs/json_stream b/src/osgPlugins/osgjs/json_stream
index 750fed322..77d7b0bed 100644
--- a/src/osgPlugins/osgjs/json_stream
+++ b/src/osgPlugins/osgjs/json_stream
@@ -28,8 +28,6 @@
 
 #include <osgDB/fstream>
 
-using namespace std;
-
 // A simple class wrapping ofstream calls to enable generic cleaning of json data.
 // Especially 'standard' json should:
 // * have utf-8 encoded string
@@ -37,8 +35,11 @@ using namespace std;
 // * does not support inf or nan values
 
 #if defined(WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<=1700)
-inline int isfinite( double x ) { return _finite( x ); }
-inline int isinf( double x ) { return !_finite( x ) && !_isnan( x ); }
+namespace std
+{
+    inline int isfinite( double x ) { return _finite( x ); }
+    inline int isinf( double x ) { return !_finite( x ) && !_isnan( x ); }
+}
 #endif
 
 
@@ -91,11 +92,11 @@ class json_stream : public osgDB::ofstream {
         }
 
         double to_valid_float(const double d) {
-            if(isfinite(d)) {
+            if(std::isfinite(d)) {
                 return d;
             }
             else {
-                if(isinf(d)) {
+                if(std::isinf(d)) {
                     return std::numeric_limits<double>::max();
                 }
                 // no much way to do better than replace invalid float NaN by 0

From 912e4f8a0cbf0968b82ea9bc99f47692813dfb5e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 28 Jun 2016 18:39:12 +0100
Subject: [PATCH 2/2] Revert "corrected syntax error in
 src/osgPlugins/fbx/ReaderWriterFBX.cpp"

This reverts commit 7a1324800ffe3e4ddd9d7fb475f0323da6fe2f43.
---
 src/osgPlugins/fbx/ReaderWriterFBX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osgPlugins/fbx/ReaderWriterFBX.cpp b/src/osgPlugins/fbx/ReaderWriterFBX.cpp
index af892debc..ee3179faa 100644
--- a/src/osgPlugins/fbx/ReaderWriterFBX.cpp
+++ b/src/osgPlugins/fbx/ReaderWriterFBX.cpp
@@ -599,7 +599,7 @@ osgDB::ReaderWriter::WriteResult ReaderWriterFBX::writeNode(
 
         if (!exportVersion.empty() && !lExporter->SetFileExportVersion(FbxString(exportVersion.c_str()), FbxSceneRenamer::eNone)) {
             std::stringstream versionsStr;
-            char const * versions = lExporter->GetCurrentWritableVersions();
+            char const * const * versions = lExporter->GetCurrentWritableVersions();
             if (versions) for(; *versions; ++versions) versionsStr << " " << *versions;
             OSG_WARN << "Can't set FBX export version to '" << exportVersion << "'. Using default. Available export versions are:" << versionsStr.str() << std::endl;
         }