commit f0d10f89674f004ea3a7eab1ecb6f342f3fb369d
author Jamie Madill <jmadill@chromium.org> Tue Mar 31 12:56:52 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Apr 01 13:38:13 2015 +0000
tree 038d3e4c69d64bc2d8e3b86d4fcec5262231c0db
parent e8e530badef5f612affda367f18eb19f5830d7b5

Replace non-copyable macro with a helper class.

This class provides a simpler scheme for blocking default copy
and assignment operators. It also reduces the amount of code
needed since it's inherited to child classes. This also fixes
the conflict between our macro and the same-named macro in
Chromium code.

BUG=angleproject:956

Change-Id: If0dc72aa3f63fbc7b8fa34907418821c64c39e2f
Reviewed-on: https://chromium-review.googlesource.com/263257
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>

src/libANGLE/renderer/ProgramImpl.h

diff --git a/src/libANGLE/renderer/ProgramImpl.h b/src/libANGLE/renderer/ProgramImpl.h
index 7621850..27257a8 100644
--- a/src/libANGLE/renderer/ProgramImpl.h
+++ b/src/libANGLE/renderer/ProgramImpl.h
@@ -28,7 +28,7 @@
     LinkResult(bool linkSuccess, const gl::Error &error);
 };
 
-class ProgramImpl
+class ProgramImpl : angle::NonCopyable
 {
   public:
     typedef int SemanticIndexArray[gl::MAX_VERTEX_ATTRIBS];
@@ -123,8 +123,6 @@
     virtual void reset();
 
   protected:
-    DISALLOW_COPY_AND_ASSIGN(ProgramImpl);
-
     std::vector<gl::LinkedUniform*> mUniforms;
     std::vector<gl::VariableLocation> mUniformIndex;
     std::vector<gl::UniformBlock*> mUniformBlocks;