Partial fix for issue #317 in v3.7.0.

When Boost 1.65.0 or higher is used, we'll rely on C++11 for smart pointers instead of the `boost/tr1/*.hpp` headers.

Author: c-lipka

source/backend/precomp.h

@@ -33,6 +33,8 @@
 ///
 //******************************************************************************
 
+#include "base/configbase.h"
+
 #include <algorithm>
 #include <cassert>
 #include <cctype>
@@ -64,6 +66,4 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/tr1/memory.hpp>
-
-
+//#include <boost/tr1/memory.hpp> // now pulled in by "base/configbase.h"

source/base/image/colourspace.cpp

@@ -247,7 +247,7 @@ SimpleGammaCurvePtr PowerLawGammaCurve::GetByEncodingGamma(float gamma)
 {
 	if (IsNeutral(gamma))
 		return NeutralGammaCurve::Get();
-	return std::tr1::dynamic_pointer_cast<SimpleGammaCurve,GammaCurve>(GetMatching(GammaCurvePtr(new PowerLawGammaCurve(gamma))));
+	return POV_TR1_NAMESPACE::dynamic_pointer_cast<SimpleGammaCurve,GammaCurve>(GetMatching(GammaCurvePtr(new PowerLawGammaCurve(gamma))));
 }
 SimpleGammaCurvePtr PowerLawGammaCurve::GetByDecodingGamma(float gamma)
 {

source/base/precomp.h

@@ -33,6 +33,8 @@
 ///
 //******************************************************************************
 
+#include "base/configbase.h"
+
 #include <algorithm>
 #include <cassert>
 #include <cctype>
@@ -64,6 +66,4 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/tr1/memory.hpp>
-
-
+//#include <boost/tr1/memory.hpp> // now pulled in by "base/configbase.h"

source/frontend/precomp.h

@@ -33,6 +33,8 @@
 ///
 //******************************************************************************
 
+#include "base/configbase.h"
+
 #include <algorithm>
 #include <cassert>
 #include <cctype>
@@ -64,6 +66,4 @@
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/unordered_map.hpp>
-#include <boost/tr1/memory.hpp>
-
-
+//#include <boost/tr1/memory.hpp> // now pulled in by "base/configbase.h"

unix/install.txt

@@ -136,6 +136,13 @@ recommanded to generate a fully-featured POV-Ray executable.
   http://www.libsdl.org
 
 
+2.4 Compatibility Issues
+    ====================
+
+- We currently do not support Boost 1.65 or above unless a C++11-compliant
+  compiler is used.
+
+
 ====================================================
 3. Configuring, building, and (un)installing POV-Ray
 ====================================================

vfe/unix/syspovconfig.h

@@ -66,7 +66,20 @@ using std::min;
 #include <string>
 #include <vector>
 #include <list>
-#include <boost/tr1/memory.hpp>
+
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106500
+    // Pulling in smart pointers is easy with Boost versions prior to 1.65.0, with the
+    // `boost/tr1/*.hpp` set of headers simply pulling in whatever is available (C++11, TR1 or
+    // boost's own implementation) and making it available in the `std::tr1` namespace.
+    #include <boost/tr1/memory.hpp>
+    #define POV_TR1_NAMESPACE std::tr1
+#else
+    // With `boost/tr1/*.hpp` unavailable, we're currently blindly relying on the compiler to
+    // be compliant with C++11.
+    #include <memory>
+    #define POV_TR1_NAMESPACE std
+#endif
 
 // when we say 'string' we mean std::string
 using std::string;
@@ -82,8 +95,11 @@ using std::list;
 using std::runtime_error;
 
 // these may actually be the boost implementations, depending on what boost/tr1/memory.hpp has pulled in
-using std::tr1::shared_ptr;
-using std::tr1::weak_ptr;
+// (NOTE: If you're running into a compile error here, you're probably trying to compile POV-Ray
+// with Boost 1.65.0 or later and a non-C++11-compliant compiler. We currently do not support such a
+// combination.)
+using POV_TR1_NAMESPACE::shared_ptr;
+using POV_TR1_NAMESPACE::weak_ptr;
 
 #endif // STD_POV_TYPES_DECLARED
 

vfe/win/syspovconfig.h

@@ -67,7 +67,20 @@ using std::min;
 #include <string>
 #include <vector>
 #include <list>
-#include <boost/tr1/memory.hpp>
+
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106500
+    // Pulling in smart pointers is easy with Boost versions prior to 1.65.0, with the
+    // `boost/tr1/*.hpp` set of headers simply pulling in whatever is available (C++11, TR1 or
+    // boost's own implementation) and making it available in the `std::tr1` namespace.
+    #include <boost/tr1/memory.hpp>
+    #define POV_TR1_NAMESPACE std::tr1
+#else
+    // With `boost/tr1/*.hpp` unavailable, we're currently blindly relying on the compiler to
+    // be compliant with C++11.
+    #include <memory>
+    #define POV_TR1_NAMESPACE std
+#endif
 
 // when we say 'string' we mean std::string
 using std::string;
@@ -83,8 +96,12 @@ using std::list;
 using std::runtime_error;
 
 // these may actually be the boost implementations, depending on what boost/tr1/memory.hpp has pulled in
-using std::tr1::shared_ptr;
-using std::tr1::weak_ptr;
+// (NOTE: If you're running into a compile error here, you're probably trying to compile POV-Ray
+// for Windows with Boost 1.65.0 or later and a non-C++11-compliant compiler. We currently do not
+// support such a combination. Please use the Boost version that came bundled with the POV-Ray
+// source code.)
+using POV_TR1_NAMESPACE::shared_ptr;
+using POV_TR1_NAMESPACE::weak_ptr;
 
 #endif // STD_POV_TYPES_DECLARED