Merge pull request #2 from hjmallon/pr.hunterise-2.4.0

Hunterise OpenEXR

Author: rbsheth

OpenEXR/CMakeLists.txt

@@ -3,8 +3,8 @@
 
 include("cmake/HunterGate.cmake")
 HunterGate(
-    URL "https://github.com/cpp-pm/hunter/archive/v0.23.242.tar.gz"
-    SHA1 "503b149d0ebdbc598e498f1669ae828a2136b838"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.245.tar.gz"
+    SHA1 "36e7f44ee4b3f8e25683e9d700f05a27ecb0a848"
 )
 
 # We require this to get object library link library support and

OpenEXR/IlmImf/ImfAttribute.cpp

@@ -63,7 +63,7 @@ Attribute::~Attribute () {}
 
 namespace {
 
-struct NameCompare: std::binary_function <const char *, const char *, bool>
+struct NameCompare
 {
     bool
     operator () (const char *x, const char *y) const
@@ -88,21 +88,8 @@ class LockedTypeMap: public TypeMap
 LockedTypeMap &
 typeMap ()
 {
-    // c++11 requires thread-safe static variable initialization
-#if __cplusplus >= 201103L
     static LockedTypeMap tMap;
     return tMap;
-#else
-    static Mutex criticalSection;
-    Lock lock (criticalSection);
-
-    static LockedTypeMap* typeMap = 0;
-
-    if (typeMap == 0)
-	typeMap = new LockedTypeMap ();
-
-    return *typeMap;
-#endif
 }