diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 22:09:08 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 22:09:08 +0000 |
| commit | fbe18ee2eb05fc759095a434c3b2a23f26cf9a89 (patch) | |
| tree | ea2dc28d636be76f839d0f34ccf58cb33c7f2a95 /o3d | |
| parent | db7556cb7ed80a650a349d734a32c5f85a4bb89a (diff) | |
| download | chromium_src-fbe18ee2eb05fc759095a434c3b2a23f26cf9a89.zip chromium_src-fbe18ee2eb05fc759095a434c3b2a23f26cf9a89.tar.gz chromium_src-fbe18ee2eb05fc759095a434c3b2a23f26cf9a89.tar.bz2 | |
Fix for gyp release build.
Apparently the compiler optimized unique_ in
InterfaceTraits to all point to the same thing
since it was marked as const. Making it non-const
seems to fix it.
Review URL: http://codereview.chromium.org/165419
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/core/cross/service_interface_traits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/core/cross/service_interface_traits.h b/o3d/core/cross/service_interface_traits.h index cf3f6d8..9db2e0a 100644 --- a/o3d/core/cross/service_interface_traits.h +++ b/o3d/core/cross/service_interface_traits.h @@ -46,7 +46,7 @@ class InterfaceTraits { static const InterfaceId kInterfaceId; private: - static const char unique_; + static char unique_; InterfaceTraits(); DISALLOW_COPY_AND_ASSIGN(InterfaceTraits); @@ -57,7 +57,7 @@ const void* const InterfaceTraits<Interface>::kInterfaceId = &InterfaceTraits<Interface>::unique_; template <typename Interface> -const char InterfaceTraits<Interface>::unique_ = 0; +char InterfaceTraits<Interface>::unique_ = 0; } // namespace o3d |