summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2012-04-04 20:03:33 +0000
committerGreg Clayton <gclayton@apple.com>2012-04-04 20:03:33 +0000
commit3c18cd3de1e20d24bfe5554ef21a7d14f18d9217 (patch)
treea83a83c22ab967f0b0dc9187672f03899b5c05d2
parentdc53f0094b87472cf277dc748dd36e628baa2037 (diff)
downloadbcm5719-llvm-3c18cd3de1e20d24bfe5554ef21a7d14f18d9217.tar.gz
bcm5719-llvm-3c18cd3de1e20d24bfe5554ef21a7d14f18d9217.zip
Fixed the C++11 #defines that wrap std::weak_ptr to actually use std::weak_ptr.
llvm-svn: 154041
-rw-r--r--lldb/include/lldb/lldb-forward.h2
-rw-r--r--lldb/tools/debugserver/source/DNBDefs.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/include/lldb/lldb-forward.h b/lldb/include/lldb/lldb-forward.h
index 144807a33f3..3842cde905f 100644
--- a/lldb/include/lldb/lldb-forward.h
+++ b/lldb/include/lldb/lldb-forward.h
@@ -17,7 +17,7 @@
#ifdef _LIBCPP_VERSION
#include <memory>
#define STD_SHARED_PTR(T) std::shared_ptr<T>
-#define STD_WEAK_PTR(T) std::shared_ptr<T>
+#define STD_WEAK_PTR(T) std::weak_ptr<T>
#define STD_ENABLE_SHARED_FROM_THIS(T) std::enable_shared_from_this<T>
#define STD_STATIC_POINTER_CAST(T,V) std::static_pointer_cast<T>(V)
#else
diff --git a/lldb/tools/debugserver/source/DNBDefs.h b/lldb/tools/debugserver/source/DNBDefs.h
index 1fa06a3b58e..b061ef222a6 100644
--- a/lldb/tools/debugserver/source/DNBDefs.h
+++ b/lldb/tools/debugserver/source/DNBDefs.h
@@ -25,7 +25,7 @@
#ifdef _LIBCPP_VERSION
#include <memory>
#define STD_SHARED_PTR(T) std::shared_ptr<T>
-#define STD_WEAK_PTR(T) std::shared_ptr<T>
+#define STD_WEAK_PTR(T) std::weak_ptr<T>
#define STD_ENABLE_SHARED_FROM_THIS(T) std::enable_shared_from_this<T>
#else
#include <tr1/memory>
OpenPOWER on IntegriCloud