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/loss_function.h

diff --git a/include/ceres/loss_function.h b/include/ceres/loss_function.h
index 81add02..c95a0a0 100644
--- a/include/ceres/loss_function.h
+++ b/include/ceres/loss_function.h
@@ -249,7 +249,7 @@
   internal::scoped_ptr<const LossFunction> rho_;
   const double a_;
   const Ownership ownership_;
-  DISALLOW_COPY_AND_ASSIGN(ScaledLoss);
+  CERES_DISALLOW_COPY_AND_ASSIGN(ScaledLoss);
 };
 
 // Sometimes after the optimization problem has been constructed, we
@@ -314,7 +314,7 @@
  private:
   internal::scoped_ptr<const LossFunction> rho_;
   Ownership ownership_;
-  DISALLOW_COPY_AND_ASSIGN(LossFunctionWrapper);
+  CERES_DISALLOW_COPY_AND_ASSIGN(LossFunctionWrapper);
 };
 
 }  // namespace ceres