After discussing with Chris Lattner, we require C++11, so lets get rid of the macros and just use C++11.

llvm-svn: 179805

4 files changed, 9 insertions, 9 deletions

diff --git a/lldb/tools/lldb-perf/lib/Gauge.cpp b/lldb/tools/lldb-perf/lib/Gauge.cpp
index 6ed12905e1b..4c4593b3b29 100644
--- a/lldb/tools/lldb-perf/lib/Gauge.cpp
+++ b/lldb/tools/lldb-perf/lib/Gauge.cpp
@@ -16,7 +16,7 @@ lldb_perf::GetResult (const char *description, double value)
 {
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->AddDouble("value", NULL, value);
         return Results::ResultSP (value_dict_ap.release());
@@ -30,7 +30,7 @@ lldb_perf::GetResult (const char *description, uint64_t value)
 {
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->AddUnsigned("value", NULL, value);
         return Results::ResultSP (value_dict_ap.release());
@@ -44,7 +44,7 @@ lldb_perf::GetResult (const char *description, std::string value)
 {
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->AddString("value", NULL, value.c_str());
         return Results::ResultSP (value_dict_ap.release());
diff --git a/lldb/tools/lldb-perf/lib/MemoryGauge.cpp b/lldb/tools/lldb-perf/lib/MemoryGauge.cpp
index de6c820928b..2a46453f540 100644
--- a/lldb/tools/lldb-perf/lib/MemoryGauge.cpp
+++ b/lldb/tools/lldb-perf/lib/MemoryGauge.cpp
@@ -92,7 +92,7 @@ MemoryStats::operator * (const MemoryStats& rhs)
 Results::ResultSP
 MemoryStats::GetResult (const char *name, const char *description) const
 {
-    STD_UNIQUE_PTR(Results::Dictionary) dict_ap (new Results::Dictionary (name, NULL));
+    std::unique_ptr<Results::Dictionary> dict_ap (new Results::Dictionary (name, NULL));
     dict_ap->AddUnsigned("resident", NULL, GetResidentSize());
     dict_ap->AddUnsigned("max_resident", NULL, GetMaxResidentSize());
     return Results::ResultSP(dict_ap.release());
diff --git a/lldb/tools/lldb-perf/lib/Results.cpp b/lldb/tools/lldb-perf/lib/Results.cpp
index d5e92bf113c..6abf67e53b6 100644
--- a/lldb/tools/lldb-perf/lib/Results.cpp
+++ b/lldb/tools/lldb-perf/lib/Results.cpp
@@ -182,7 +182,7 @@ Results::Dictionary::AddUnsigned (const char *name, const char *description, uin
     assert (name && name[0]);
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->AddUnsigned("value", NULL, value);
         m_dictionary[std::string(name)] = ResultSP (value_dict_ap.release());
@@ -199,7 +199,7 @@ Results::Dictionary::AddDouble (const char *name, const char *description, doubl
     
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->AddDouble("value", NULL, value);
         m_dictionary[std::string(name)] = ResultSP (value_dict_ap.release());
@@ -214,7 +214,7 @@ Results::Dictionary::AddString (const char *name, const char *description, const
     assert (name && name[0]);
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->AddString("value", NULL, value);
         m_dictionary[std::string(name)] = ResultSP (value_dict_ap.release());
@@ -230,7 +230,7 @@ Results::Dictionary::Add (const char *name, const char *description, const Resul
     assert (name && name[0]);
     if (description && description[0])
     {
-        STD_UNIQUE_PTR(Results::Dictionary) value_dict_ap (new Results::Dictionary ());
+        std::unique_ptr<Results::Dictionary> value_dict_ap (new Results::Dictionary ());
         value_dict_ap->AddString("description", NULL, description);
         value_dict_ap->Add("value", NULL, result_sp);
         m_dictionary[std::string(name)] = ResultSP (value_dict_ap.release());
diff --git a/lldb/tools/lldb-perf/lib/Results.h b/lldb/tools/lldb-perf/lib/Results.h
index 41501758dae..388077e7f58 100644
--- a/lldb/tools/lldb-perf/lib/Results.h
+++ b/lldb/tools/lldb-perf/lib/Results.h
@@ -123,7 +123,7 @@ public:
         Type m_type;
     };
     
-    typedef STD_SHARED_PTR(Result) ResultSP;
+    typedef std::shared_ptr<Result> ResultSP;
 
     class Array : public Result
     {