From 53e08c44dd34857ba57581d7c5774d6c96a8d0e1 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 14 Sep 2010 05:38:21 +0000 Subject: Include gtest and gmock headers as user headers instead of system headers. --- src/gmock-all.cc | 2 +- src/gmock-cardinalities.cc | 6 +++--- src/gmock-internal-utils.cc | 8 ++++---- src/gmock-matchers.cc | 4 ++-- src/gmock-spec-builders.cc | 6 +++--- src/gmock.cc | 4 ++-- src/gmock_main.cc | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/gmock-all.cc b/src/gmock-all.cc index 76118d88..7aebce7a 100644 --- a/src/gmock-all.cc +++ b/src/gmock-all.cc @@ -37,7 +37,7 @@ // This line ensures that gmock.h can be compiled on its own, even // when it's fused. -#include +#include "gmock/gmock.h" // The following lines pull in the real gmock *.cc files. #include "src/gmock-cardinalities.cc" diff --git a/src/gmock-cardinalities.cc b/src/gmock-cardinalities.cc index 07eed469..1a7902b4 100644 --- a/src/gmock-cardinalities.cc +++ b/src/gmock-cardinalities.cc @@ -33,14 +33,14 @@ // // This file implements cardinalities. -#include +#include "gmock/gmock-cardinalities.h" #include #include // NOLINT #include #include -#include -#include +#include "gmock/internal/gmock-internal-utils.h" +#include "gtest/gtest.h" namespace testing { diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc index 9debe187..dd38132a 100644 --- a/src/gmock-internal-utils.cc +++ b/src/gmock-internal-utils.cc @@ -35,14 +35,14 @@ // Mock. They are subject to change without notice, so please DO NOT // USE THEM IN USER CODE. -#include +#include "gmock/internal/gmock-internal-utils.h" #include #include // NOLINT #include -#include -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" +#include "gtest/gtest.h" namespace testing { namespace internal { diff --git a/src/gmock-matchers.cc b/src/gmock-matchers.cc index 89007d9f..a5e6824d 100644 --- a/src/gmock-matchers.cc +++ b/src/gmock-matchers.cc @@ -34,8 +34,8 @@ // This file implements Matcher, Matcher, and // utilities for defining matchers. -#include -#include +#include "gmock/gmock-matchers.h" +#include "gmock/gmock-generated-matchers.h" #include #include diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index dab1a2c9..0d40d9cd 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -34,15 +34,15 @@ // This file implements the spec builder syntax (ON_CALL and // EXPECT_CALL). -#include +#include "gmock/gmock-spec-builders.h" #include #include // NOLINT #include #include #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC #include // NOLINT diff --git a/src/gmock.cc b/src/gmock.cc index f487265d..700bcb2e 100644 --- a/src/gmock.cc +++ b/src/gmock.cc @@ -29,8 +29,8 @@ // // Author: wan@google.com (Zhanyong Wan) -#include -#include +#include "gmock/gmock.h" +#include "gmock/internal/gmock-port.h" namespace testing { diff --git a/src/gmock_main.cc b/src/gmock_main.cc index 0a3071bf..3725ae72 100644 --- a/src/gmock_main.cc +++ b/src/gmock_main.cc @@ -30,8 +30,8 @@ // Author: wan@google.com (Zhanyong Wan) #include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" // MS C++ compiler/linker has a bug on Windows (not on Windows CE), which // causes a link error when _tmain is defined in a static library and UNICODE -- cgit v1.2.3