diff --git a/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp b/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp --- a/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp +++ b/lldb/examples/interposing/darwin/fd_interposing/FDInterposing.cpp @@ -68,13 +68,6 @@ #include #include -/// \def DISALLOW_COPY_AND_ASSIGN(TypeName) -/// Macro definition for easily disallowing copy constructor and -/// assignment operators in C++ classes. -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName &); \ - const TypeName &operator=(const TypeName &) - extern "C" { int accept$NOCANCEL(int, struct sockaddr *__restrict, socklen_t *__restrict); int close$NOCANCEL(int); diff --git a/lldb/include/lldb/lldb-defines.h b/lldb/include/lldb/lldb-defines.h --- a/lldb/include/lldb/lldb-defines.h +++ b/lldb/include/lldb/lldb-defines.h @@ -133,15 +133,4 @@ #define UNUSED_IF_ASSERT_DISABLED(x) ((void)(x)) -#if defined(__cplusplus) - -/// \def DISALLOW_COPY_AND_ASSIGN(TypeName) -/// Macro definition for easily disallowing copy constructor and -/// assignment operators in C++ classes. -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName &) = delete; \ - const TypeName &operator=(const TypeName &) = delete - -#endif // #if defined(__cplusplus) - #endif // LLDB_LLDB_DEFINES_H diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.h @@ -172,7 +172,8 @@ // dSYMs next to them lldb_private::LazyBool m_ios_debug_session; - DISALLOW_COPY_AND_ASSIGN(PlatformDarwinKernel); + PlatformDarwinKernel(const PlatformDarwinKernel &) = delete; + const PlatformDarwinKernel &operator=(const PlatformDarwinKernel &) = delete; }; #else // __APPLE__