commit 237d659b8d00cbbf54366656b3d8b34068a03b1c
author Sameer Agarwal <sameeragarwal@google.com> Wed May 30 20:34:49 2012 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Wed May 30 21:50:32 2012 -0700
tree f1f604c89afc5d5eed4a035073f0a128f53b90f4
parent aa9a83c657c863b38d69c21c5fa2213ac472a319

Added CERES_ prefix to the DISALLOW macros.

Change-Id: Ib81e9112e8bbc6ed6cb52f21825df0f6e659be51

include/ceres/internal/macros.h

diff --git a/include/ceres/internal/macros.h b/include/ceres/internal/macros.h
index 05d6287..7dd4e3e 100644
--- a/include/ceres/internal/macros.h
+++ b/include/ceres/internal/macros.h
@@ -43,11 +43,13 @@
 //
 // For disallowing only assign or copy, write the code directly, but declare
 // the intend in a comment, for example:
-// void operator=(const TypeName&);  // DISALLOW_ASSIGN
-// Note, that most uses of DISALLOW_ASSIGN and DISALLOW_COPY are broken
-// semantically, one should either use disallow both or neither. Try to
-// avoid these in new code.
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+//
+//   void operator=(const TypeName&);  // _DISALLOW_ASSIGN
+
+// Note, that most uses of CERES_DISALLOW_ASSIGN and CERES_DISALLOW_COPY
+// are broken semantically, one should either use disallow both or
+// neither. Try to avoid these in new code.
+#define CERES_DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
@@ -57,9 +59,9 @@
 // This should be used in the private: declarations for a class
 // that wants to prevent anyone from instantiating it. This is
 // especially useful for classes containing only static methods.
-#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
+#define CERES_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
   TypeName();                                    \
-  DISALLOW_COPY_AND_ASSIGN(TypeName)
+  CERES_DISALLOW_COPY_AND_ASSIGN(TypeName)
 
 // The arraysize(arr) macro returns the # of elements in an array arr.
 // The expression is a compile-time constant, and therefore can be