compat: Implement std::make_unique.

2 files changed, 19 insertions, 4 deletions

diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
index 682ddf61..817095bb 100644
--- a/cli/cli_dump.cpp
+++ b/cli/cli_dump.cpp
@@ -37,7 +37,7 @@
 #include <fstream>
 #include <string>
 
-#include "cxx_compat.hpp" // for std::to_string
+#include "cxx_compat.hpp" // for std::to_string, std::make_unique
 
 #include "cli.hpp"
 #include "cli_pager.hpp"
@@ -224,9 +224,9 @@ command(int argc, char *argv[])
     std::unique_ptr<trace::Dumper> dumper;
 
     if (blobs) {
-        dumper = std::unique_ptr<trace::Dumper>(new BlobDumper(std::cout, dumpFlags));
+        dumper = std::make_unique<BlobDumper>(std::cout, dumpFlags);
     } else {
-        dumper = std::unique_ptr<trace::Dumper>(new trace::Dumper(std::cout, dumpFlags));
+        dumper = std::make_unique<trace::Dumper>(std::cout, dumpFlags);
     }
 
     for (int i = optind; i < argc; ++i) {
diff --git a/compat/cxx_compat.hpp b/compat/cxx_compat.hpp
index 1f67fb17..37d41c40 100644
--- a/compat/cxx_compat.hpp
+++ b/compat/cxx_compat.hpp
@@ -31,7 +31,7 @@
 
 
 /*
- * Emulate std::to_string on Android
+ * Emulate std::to_string on Android.
  *
  * XXX: There might be different solutions per
  * http://stackoverflow.com/questions/26095886/error-to-string-is-not-a-member-of-std
@@ -48,3 +48,18 @@ namespace std {
     }
 }
 #endif /* ANDROID */
+
+
+/*
+ * Implement std::make_unique on C++11.
+ */
+#if !defined(_MSC_VER) && __cplusplus < 201402L
+#include <memory>
+#include <utility>
+namespace std {
+    template< typename T, typename... Args >
+    unique_ptr<T> make_unique(Args&&... args) {
+        return unique_ptr<T>(new T(forward<Args>(args)...));
+    }
+}
+#endif