Merge branch 'make_unique' into 'master'

Break compatibility with pre-C++11, implement make_unique

@moebius, @lyon - if I understood you correctly, OVM and OM shall also be C++-11-and-up? If so, we can avoid some more ifdef complexity by just breaking compatibility now.
(If not, I'll revise my make_unique patch)

Let me know if you'd prefer separate PRs.

See merge request !13

src/OpenVolumeMesh/System/MemoryInclude.hh

@@ -32,59 +32,92 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision: 36 $                                                         *
- *   $Date: 2012-01-10 18:00:06 +0100 (Di, 10 Jan 2012) $                    *
- *   $LastChangedBy: kremer $                                                *
- *                                                                           *
-\*===========================================================================*/
+#ifndef ACG_UTILS_SMARTPOINTER_HH
+#define ACG_UTILS_SMARTPOINTER_HH
 
-#ifndef MEMORYINCLUDE_HH_
-#define MEMORYINCLUDE_HH_
-
-/** This set of defines maps the pointer namespaces to the namespace ptr depending on
- *  the current architecture and compilers.
- */
-#if (__cplusplus >= 201103L)
-   // C++11:
-   #include <memory>
-   namespace ptr = std;
-   #define ACG_UNIQUE_POINTER_SUPPORTED 1
-#elif defined(__GXX_EXPERIMENTAL_CXX0X__)
-   // C++11 via -std=c++0x on gcc:
-   #include <memory>
-   namespace ptr = std;
-   #define ACG_UNIQUE_POINTER_SUPPORTED 1
-#else
-   // C++98 and TR1:
-   #if (_MSC_VER >= 1600)
-     // VStudio 2010 supports some C++11 features
-     #include <memory>
-     namespace ptr = std;
-     #define ACG_UNIQUE_POINTER_SUPPORTED 1
-   #elif (_MSC_VER >= 1500)
-     // hope for TR1 equivalents
-    #if(_HAS_TR1)
-     #include <memory>
-     namespace ptr = std::tr1;
-     #define ACG_UNIQUE_POINTER_SUPPORTED 0
-    #else
-     #pragma warning "TR1 not available! Please install Visual Studio Service Pack 1!"
-    #endif
-   #else
-    // hope for TR1 equivalents
-     // check for clang5 but switch to tr1 if clang uses libstdc++
-    #if defined(__clang_major__) && (__clang_major__ >= 5) && !defined(__GLIBCXX__ )
-      // Mavericks special treatment
-      #include <memory>
-      namespace ptr = std;
+ /**********************************************
+  * Warning! This header file is duplicated in *
+  * OpenFlipper with the same header guard, as *
+  * ACG/Utils/SmartPointer.hh.                 *
+  * If you change this file, you should change *
+  * that file as well.                         *
+  **********************************************/
+
+#include <memory>
+
+// Default for C++ 11 and higher
+#if ((defined(_MSC_VER) && (_MSC_VER >= 1900)) || __cplusplus > 199711L || defined(__GXX_EXPERIMENTAL_CXX0X__))
+
+  // legacy code may depend on this define:
+  #define ACG_UNIQUE_POINTER_SUPPORTED 1
+
+  namespace ptr {
+      using std::shared_ptr;
+      using std::make_shared;
+      using std::unique_ptr;
+
+  #if __cplusplus >= 201402L
+    using std::make_unique;
+  #else
+    template<typename T, typename... Args>
+    std::unique_ptr<T>
+    make_unique(Args&&... args) {
+        return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+    }
+  #endif // C++14
+
+  } // namespace ptr
+
+
+#else // deprecated things
+
+    /** This set of defines maps the pointer namespaces to the namespace ptr depending on
+     *  the current architecture and compilers.
+     */
+    #if ( (__cplusplus >= 201103L)  || (__STDC_VERSION__ >= 201112L) )
+       // C++11:
+       #include <memory>
+       namespace ptr = std;
+       #define ACG_UNIQUE_POINTER_SUPPORTED 1
+    #elif defined(__GXX_EXPERIMENTAL_CXX0X__)
+       // C++11 via -std=c++0x on gcc:
+       #include <memory>
+       namespace ptr = std;
+       #define ACG_UNIQUE_POINTER_SUPPORTED 1
     #else
-      #include <tr1/memory>
-      namespace ptr = std::tr1;
+       // C++98 and TR1:
+       #if (_MSC_VER >= 1600)
+         // VStudio 2010 supports some C++11 features
+         #include <memory>
+         namespace ptr = std;
+         #define ACG_UNIQUE_POINTER_SUPPORTED 1
+       #elif (_MSC_VER >= 1500)
+         // hope for TR1 equivalents
+        #if(_HAS_TR1)
+         #include <memory>
+         namespace ptr = std::tr1;
+         #define ACG_UNIQUE_POINTER_SUPPORTED 0
+        #else
+         #pragma warning "TR1 not available! Please install Visual Studio Service Pack 1!"
+        #endif
+       #else
+         // hope for TR1 equivalents
+         // check for clang5 but switch to tr1 if clang uses libstdc++
+         #if defined(__clang_major__) && (__clang_major__ >= 5) && !defined(__GLIBCXX__ )
+          // Mavericks special treatment
+          #include <memory>
+          namespace ptr = std;
+        #else
+          #include <tr1/memory>
+          namespace ptr = std::tr1;
+        #endif
+        #define ACG_UNIQUE_POINTER_SUPPORTED 0
+       #endif
     #endif
-    #define ACG_UNIQUE_POINTER_SUPPORTED 0
-   #endif
 #endif
 
-#endif /* MEMORYINCLUDE_HH_ */
+
+
+
+#endif // ACG_UTILS_SMARTPOINTER_HH
+

src/Unittests/unittests_smartptr.cc

+#include <gtest/gtest.h>
+
+#if __cplusplus >= 201103L
+
+#include <OpenVolumeMesh/System/MemoryInclude.hh>
+
+TEST(MakeUniqueTest, MakeUniqueTest) {
+  std::unique_ptr<int> foo;
+  auto bar = ptr::make_unique<int>(5);
+  foo = std::move(bar);
+
+  EXPECT_EQ(*foo, 5);
+  EXPECT_EQ(bar.get(), nullptr);
+}
+
+#endif