Fix issue 289, C++17 compatibility

AcademySoftwareFoundation · Nov 21, 2019 · 780c223 · 780c223
1 parent d778a0b
commit 780c223
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/OpenEXR/IlmImf/ImfAttribute.cpp b/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
 }