diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 00:06:54 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 00:06:54 +0000 |
| commit | a08bfa6f5b6115a910060405ec8e88db8f8e539e (patch) | |
| tree | c75d161ec4c92b5199ed21928b19beedf5963c8c /gpu | |
| parent | b167ca6631fbfdc18101c8843aea02474f97447d (diff) | |
| download | chromium_src-a08bfa6f5b6115a910060405ec8e88db8f8e539e.zip chromium_src-a08bfa6f5b6115a910060405ec8e88db8f8e539e.tar.gz chromium_src-a08bfa6f5b6115a910060405ec8e88db8f8e539e.tar.bz2 | |
Work around bug in gcc's name mangling causing linker to crash on Mac
OS X.
BUG=40845
TEST=none
TBR=gman
Review URL: http://codereview.chromium.org/2079003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_lib.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gpu/command_buffer/client/gles2_lib.cc b/gpu/command_buffer/client/gles2_lib.cc index d80d4e1..6bfd0c7 100644 --- a/gpu/command_buffer/client/gles2_lib.cc +++ b/gpu/command_buffer/client/gles2_lib.cc @@ -6,9 +6,11 @@ #include "../common/thread_local.h" namespace gles2 { -namespace { -gpu::ThreadLocalKey g_gl_context_key; -} // namespace anonymous +// TODO(kbr): the use of this anonymous namespace core dumps the +// linker on Mac OS X 10.6 when the symbol ordering file is used +// namespace { +static gpu::ThreadLocalKey g_gl_context_key; +// } // namespace anonymous void Initialize() { g_gl_context_key = gpu::ThreadLocalAlloc(); |