From dac3e879c56a50696a36f53e1e5e353e48fa665f Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 14 Sep 2010 05:35:59 +0000 Subject: Include gtest headers as user headers instead of system headers. --- src/gtest-all.cc | 2 +- src/gtest-death-test.cc | 8 ++++---- src/gtest-filepath.cc | 6 +++--- src/gtest-internal-inl.h | 6 +++--- src/gtest-port.cc | 8 ++++---- src/gtest-printers.cc | 4 ++-- src/gtest-test-part.cc | 2 +- src/gtest-typed-test.cc | 4 ++-- src/gtest.cc | 4 ++-- src/gtest_main.cc | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/gtest-all.cc b/src/gtest-all.cc index f3e22dd7..0a9cee52 100644 --- a/src/gtest-all.cc +++ b/src/gtest-all.cc @@ -36,7 +36,7 @@ // This line ensures that gtest.h can be compiled on its own, even // when it's fused. -#include +#include "gtest/gtest.h" // The following lines pull in the real gtest *.cc files. #include "src/gtest.cc" diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc index 66bf1898..ffd9f3a4 100644 --- a/src/gtest-death-test.cc +++ b/src/gtest-death-test.cc @@ -31,8 +31,8 @@ // // This file implements death tests. -#include -#include +#include "gtest/gtest-death-test.h" +#include "gtest/internal/gtest-port.h" #if GTEST_HAS_DEATH_TEST @@ -54,8 +54,8 @@ #endif // GTEST_HAS_DEATH_TEST -#include -#include +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-string.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/src/gtest-filepath.cc b/src/gtest-filepath.cc index c1ef9188..96557f38 100644 --- a/src/gtest-filepath.cc +++ b/src/gtest-filepath.cc @@ -29,8 +29,8 @@ // // Authors: keith.ray@gmail.com (Keith Ray) -#include -#include +#include "gtest/internal/gtest-filepath.h" +#include "gtest/internal/gtest-port.h" #include @@ -57,7 +57,7 @@ #define GTEST_PATH_MAX_ _POSIX_PATH_MAX #endif // GTEST_OS_WINDOWS -#include +#include "gtest/internal/gtest-string.h" namespace testing { namespace internal { diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index fe53c218..e0f4af5a 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -56,14 +56,14 @@ #include #include -#include +#include "gtest/internal/gtest-port.h" #if GTEST_OS_WINDOWS #include // For DWORD. #endif // GTEST_OS_WINDOWS -#include // NOLINT -#include +#include "gtest/gtest.h" // NOLINT +#include "gtest/gtest-spi.h" namespace testing { diff --git a/src/gtest-port.cc b/src/gtest-port.cc index 8a7005f7..ae0c663d 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -29,7 +29,7 @@ // // Author: wan@google.com (Zhanyong Wan) -#include +#include "gtest/internal/gtest-port.h" #include #include @@ -51,9 +51,9 @@ #include #endif // GTEST_OS_MAC -#include -#include -#include +#include "gtest/gtest-spi.h" +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-string.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/src/gtest-printers.cc b/src/gtest-printers.cc index 07a0d857..147f8b2a 100644 --- a/src/gtest-printers.cc +++ b/src/gtest-printers.cc @@ -42,12 +42,12 @@ // or void PrintTo(const Foo&, ::std::ostream*) in the namespace that // defines Foo. -#include +#include "gtest/gtest-printers.h" #include #include #include // NOLINT #include -#include +#include "gtest/internal/gtest-port.h" namespace testing { diff --git a/src/gtest-test-part.cc b/src/gtest-test-part.cc index 5d183a44..5ddc67c1 100644 --- a/src/gtest-test-part.cc +++ b/src/gtest-test-part.cc @@ -31,7 +31,7 @@ // // The Google C++ Testing Framework (Google Test) -#include +#include "gtest/gtest-test-part.h" // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is diff --git a/src/gtest-typed-test.cc b/src/gtest-typed-test.cc index f70043e6..a5cc88f9 100644 --- a/src/gtest-typed-test.cc +++ b/src/gtest-typed-test.cc @@ -29,8 +29,8 @@ // // Author: wan@google.com (Zhanyong Wan) -#include -#include +#include "gtest/gtest-typed-test.h" +#include "gtest/gtest.h" namespace testing { namespace internal { diff --git a/src/gtest.cc b/src/gtest.cc index 4f0446dd..34e56d75 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -31,8 +31,8 @@ // // The Google C++ Testing Framework (Google Test) -#include -#include +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" #include #include diff --git a/src/gtest_main.cc b/src/gtest_main.cc index 6d4d22d2..a09bbe0c 100644 --- a/src/gtest_main.cc +++ b/src/gtest_main.cc @@ -29,7 +29,7 @@ #include -#include +#include "gtest/gtest.h" GTEST_API_ int main(int argc, char **argv) { std::cout << "Running main() from gtest_main.cc\n"; -- cgit v1.2.3