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, 21 insertions, 21 deletions

diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 661512c222b..ed242239ef6 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -391,7 +391,7 @@ CommandInterpreter::LoadCommandDictionary ()
     
     size_t num_regexes = sizeof break_regexes/sizeof(char *[2]);
         
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     break_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                       "_regexp-break",
                                                       "Set a breakpoint using a regular expression to specify the location, where <linenum> is in decimal and <address> is in hex.",
@@ -418,7 +418,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     tbreak_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                       "_regexp-tbreak",
                                                       "Set a one shot breakpoint using a regular expression to specify the location, where <linenum> is in decimal and <address> is in hex.",
@@ -449,7 +449,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     attach_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                        "_regexp-attach",
                                                        "Attach to a process id if in decimal, otherwise treat the argument as a process name to attach to.",
@@ -467,7 +467,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
     
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     down_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                      "_regexp-down",
                                                      "Go down \"n\" frames in the stack (1 frame by default).",
@@ -482,7 +482,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
     
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     up_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                    "_regexp-up",
                                                    "Go up \"n\" frames in the stack (1 frame by default).",
@@ -497,7 +497,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     display_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                         "_regexp-display",
                                                         "Add an expression evaluation stop-hook.",
@@ -511,7 +511,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     undisplay_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                           "_regexp-undisplay",
                                                           "Remove an expression evaluation stop-hook.",
@@ -525,7 +525,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     connect_gdb_remote_cmd_ap(new CommandObjectRegexCommand (*this,
                                                              "gdb-remote",
                                                              "Connect to a remote GDB server.  If no hostname is provided, localhost is assumed.",
@@ -540,7 +540,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     connect_kdp_remote_cmd_ap(new CommandObjectRegexCommand (*this,
                                                              "kdp-remote",
                                                              "Connect to a remote KDP server.  udp port 41139 is the default port number.",
@@ -555,7 +555,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     bt_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                      "_regexp-bt",
                                                      "Show a backtrace.  An optional argument is accepted; if that argument is a number, it specifies the number of frames to display.  If that argument is 'all', full backtraces of all threads are displayed.",
@@ -575,7 +575,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     list_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                      "_regexp-list",
                                                      "Implements the GDB 'list' command in all of its forms except FILE:FUNCTION and maps them to the appropriate 'source list' commands.",
@@ -597,7 +597,7 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
-    STD_UNIQUE_PTR(CommandObjectRegexCommand)
+    std::unique_ptr<CommandObjectRegexCommand>
     env_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                     "_regexp-env",
                                                     "Implements a shortcut to viewing and setting environment variables.",
diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp
index 9b4211bd508..8318c4dd9ba 100644
--- a/lldb/source/Interpreter/Options.cpp
+++ b/lldb/source/Interpreter/Options.cpp
@@ -901,7 +901,7 @@ Options::HandleOptionArgumentCompletion
 )
 {
     const OptionDefinition *opt_defs = GetDefinitions();
-    STD_UNIQUE_PTR(SearchFilter) filter_ap;
+    std::unique_ptr<SearchFilter> filter_ap;
 
     int opt_arg_pos = opt_element_vector[opt_element_index].opt_arg_pos;
     int opt_defs_index = opt_element_vector[opt_element_index].opt_defs_index;
diff --git a/lldb/source/Interpreter/ScriptInterpreter.cpp b/lldb/source/Interpreter/ScriptInterpreter.cpp
index 0609cf9978f..67314731df2 100644
--- a/lldb/source/Interpreter/ScriptInterpreter.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreter.cpp
@@ -81,10 +81,10 @@ ScriptInterpreter::LanguageToString (lldb::ScriptLanguage language)
     return return_value;
 }
 
-STD_UNIQUE_PTR(ScriptInterpreterLocker)
+std::unique_ptr<ScriptInterpreterLocker>
 ScriptInterpreter::AcquireInterpreterLock ()
 {
-    return STD_UNIQUE_PTR(ScriptInterpreterLocker)(new ScriptInterpreterLocker());
+    return std::unique_ptr<ScriptInterpreterLocker>(new ScriptInterpreterLocker());
 }
 
 void
diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 260a6c3ad3f..eab33c7c6f6 100644
--- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -1321,7 +1321,7 @@ ScriptInterpreterPython::GenerateBreakpointOptionsCommandCallback
     case eInputReaderDone:
         {
             BreakpointOptions *bp_options = (BreakpointOptions *)baton;
-            STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new BreakpointOptions::CommandData());
+            std::unique_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());
             data_ap->user_source.AppendList (commands_in_progress);
             if (data_ap.get())
             {
@@ -1427,7 +1427,7 @@ ScriptInterpreterPython::GenerateWatchpointOptionsCommandCallback
     case eInputReaderDone:
         {
             WatchpointOptions *wp_options = (WatchpointOptions *)baton;
-            STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new WatchpointOptions::CommandData());
+            std::unique_ptr<WatchpointOptions::CommandData> data_ap(new WatchpointOptions::CommandData());
             data_ap->user_source.AppendList (commands_in_progress);
             if (data_ap.get())
             {
@@ -1534,7 +1534,7 @@ void
 ScriptInterpreterPython::SetBreakpointCommandCallback (BreakpointOptions *bp_options,
                                                        const char *oneliner)
 {
-    STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new BreakpointOptions::CommandData());
+    std::unique_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());
 
     // It's necessary to set both user_source and script_source to the oneliner.
     // The former is used to generate callback description (as in breakpoint command list)
@@ -1557,7 +1557,7 @@ void
 ScriptInterpreterPython::SetWatchpointCommandCallback (WatchpointOptions *wp_options,
                                                        const char *oneliner)
 {
-    STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new WatchpointOptions::CommandData());
+    std::unique_ptr<WatchpointOptions::CommandData> data_ap(new WatchpointOptions::CommandData());
 
     // It's necessary to set both user_source and script_source to the oneliner.
     // The former is used to generate callback description (as in watchpoint command list)
@@ -2807,10 +2807,10 @@ ScriptInterpreterPython::GetDocumentationForItem(const char* item, std::string&
     }
 }
 
-STD_UNIQUE_PTR(ScriptInterpreterLocker)
+std::unique_ptr<ScriptInterpreterLocker>
 ScriptInterpreterPython::AcquireInterpreterLock ()
 {
-    STD_UNIQUE_PTR(ScriptInterpreterLocker) py_lock(new Locker(this,
+    std::unique_ptr<ScriptInterpreterLocker> py_lock(new Locker(this,
                                                               Locker::AcquireLock | Locker::InitSession,
                                                               Locker::FreeLock | Locker::TearDownSession));
     return py_lock;