From fbe18ee2eb05fc759095a434c3b2a23f26cf9a89 Mon Sep 17 00:00:00 2001 From: "gman@google.com" Date: Thu, 13 Aug 2009 22:09:08 +0000 Subject: 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 --- o3d/core/cross/service_interface_traits.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'o3d') 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::kInterfaceId = &InterfaceTraits::unique_; template -const char InterfaceTraits::unique_ = 0; +char InterfaceTraits::unique_ = 0; } // namespace o3d -- cgit v1.1