diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 18:26:57 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 18:26:57 +0000 |
| commit | cd1f2455551054586a441fff03f15a92e31114e9 (patch) | |
| tree | 03b86c075f636374ebd5f0f2a113006e6d1b17c8 /gpu/command_buffer/service/framebuffer_manager_unittest.cc | |
| parent | dac716a0ab0c600bfef13d2738ce749bdc13b03a (diff) | |
| download | chromium_src-cd1f2455551054586a441fff03f15a92e31114e9.zip chromium_src-cd1f2455551054586a441fff03f15a92e31114e9.tar.gz chromium_src-cd1f2455551054586a441fff03f15a92e31114e9.tar.bz2 | |
Change X11 error handler override to allow easy X11 error checking.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7889040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/framebuffer_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/framebuffer_manager_unittest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc index 77c6622..7bd4872 100644 --- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// Include gtest.h out of order because <X11/X.h> #define's Bool & None, which +// gtest uses as struct names (inside a namespace). This means that +// #include'ing gtest after anything that pulls in X.h fails to compile. +// This is http://code.google.com/p/googletest/issues/detail?id=371 +#include "testing/gtest/include/gtest/gtest.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/service/framebuffer_manager.h" #include "gpu/command_buffer/service/feature_info.h" -#include "gpu/command_buffer/common/gl_mock.h" -#include "testing/gtest/include/gtest/gtest.h" - namespace gpu { namespace gles2 { @@ -364,5 +367,3 @@ TEST_F(FramebufferInfoTest, AttachTexture) { } // namespace gles2 } // namespace gpu - - |