diff options
Diffstat (limited to 'gpu/command_buffer/service/id_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/id_manager_unittest.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/id_manager_unittest.cc b/gpu/command_buffer/service/id_manager_unittest.cc index 015a442..7f7e676 100644 --- a/gpu/command_buffer/service/id_manager_unittest.cc +++ b/gpu/command_buffer/service/id_manager_unittest.cc @@ -1,9 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gpu/command_buffer/service/id_manager.h" +// 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/service/id_manager.h" namespace gpu { namespace gles2 { @@ -72,5 +76,3 @@ TEST_F(IdManagerTest, Basic) { } // namespace gles2 } // namespace gpu - - |