Update the DISALLOW_COPY_AND_ASSIGN macro to use c++ operator deletion.

Also remove the TSymbol copy constructor which is not used. BUG=angle:836 Change-Id: I4f35f554c90d01dc2132d244a1974d9a8dc89bbd Reviewed-on: https://chromium-review.googlesource.com/231231Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Update the DISALLOW_COPY_AND_ASSIGN macro to use c++ operator deletion.
e371f1d7 · Geoff Lang · cc4cd292 · e371f1d7 · e371f1d7
Commit e371f1d7 authored Nov 21, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 9 deletions

angleutils.h src/common/angleutils.h +5 -3

SymbolTable.cpp src/compiler/translator/SymbolTable.cpp +0 -6

No files found.
--- a/src/common/angleutils.h
+++ b/src/common/angleutils.h
@@ -21,9 +21,11 @@

 // A macro to disallow the copy constructor and operator= functions
 // This must be used in the private: declarations for a class
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&);               \
-  void operator=(const TypeName&)
+#define DISALLOW_COPY_AND_ASSIGN(TypeName)    \
+    TypeName(const TypeName&) = delete;       \
+    TypeName(TypeName&&) = delete;            \
+    void operator=(const TypeName&) = delete; \
+    void operator=(TypeName&&) = delete;

 template <typename T, size_t N>
 inline size_t ArraySize(T(&)[N])

--- a/src/compiler/translator/SymbolTable.cpp
+++ b/src/compiler/translator/SymbolTable.cpp
@@ -92,12 +92,6 @@ void TSymbolTableLevel::relateToExtension(const char *name, const TString &ext)
    }
 }

-TSymbol::TSymbol(const TSymbol &copyOf)
-{
-    name = NewPoolTString(copyOf.name->c_str());
-    uniqueId = copyOf.uniqueId;
-}
-
 TSymbol *TSymbolTable::find(const TString &name, int shaderVersion,
                            bool *builtIn, bool *sameScope) const
 {