diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 17:26:47 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 17:26:47 +0000 |
| commit | f46b678bca862b17a246b80f1d07aa06e1317bc0 (patch) | |
| tree | 8cb6d3a192821a10e802a567aa4a4ce346745290 /cc/quads/render_pass.h | |
| parent | f2d1ab24b41dd0e3f2c1860005d19cb03637bdf8 (diff) | |
| download | chromium_src-f46b678bca862b17a246b80f1d07aa06e1317bc0.zip chromium_src-f46b678bca862b17a246b80f1d07aa06e1317bc0.tar.gz chromium_src-f46b678bca862b17a246b80f1d07aa06e1317bc0.tar.bz2 | |
Move hash_pair.h from cc/base into base/.
BUG=
Review URL: https://chromiumcodereview.appspot.com/17094004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads/render_pass.h')
| -rw-r--r-- | cc/quads/render_pass.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h index 14c657e..f288569 100644 --- a/cc/quads/render_pass.h +++ b/cc/quads/render_pass.h @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/containers/hash_tables.h" #include "cc/base/cc_export.h" -#include "cc/base/hash_pair.h" #include "cc/base/scoped_ptr_hash_map.h" #include "cc/base/scoped_ptr_vector.h" #include "skia/ext/refptr.h" @@ -111,6 +110,7 @@ class CC_EXPORT RenderPass { protected: RenderPass(); + private: DISALLOW_COPY_AND_ASSIGN(RenderPass); }; @@ -134,7 +134,7 @@ struct hash<cc::RenderPass::Id> { #else #error define a hash function for your compiler #endif // COMPILER -} +} // namespace BASE_HASH_NAMESPACE namespace cc { typedef ScopedPtrVector<RenderPass> RenderPassList; |