Include gtest and gmock headers as user headers instead of system headers.

This commit is contained in:
zhanyong.wan
2010-09-14 05:38:21 +00:00
parent ad7c462be7
commit 53e08c44dd
42 changed files with 124 additions and 124 deletions

View File

@@ -37,7 +37,7 @@
// This line ensures that gmock.h can be compiled on its own, even
// when it's fused.
#include <gmock/gmock.h>
#include "gmock/gmock.h"
// The following lines pull in the real gmock *.cc files.
#include "src/gmock-cardinalities.cc"

View File

@@ -33,14 +33,14 @@
//
// This file implements cardinalities.
#include <gmock/gmock-cardinalities.h>
#include "gmock/gmock-cardinalities.h"
#include <limits.h>
#include <ostream> // NOLINT
#include <sstream>
#include <string>
#include <gmock/internal/gmock-internal-utils.h>
#include <gtest/gtest.h>
#include "gmock/internal/gmock-internal-utils.h"
#include "gtest/gtest.h"
namespace testing {

View File

@@ -35,14 +35,14 @@
// Mock. They are subject to change without notice, so please DO NOT
// USE THEM IN USER CODE.
#include <gmock/internal/gmock-internal-utils.h>
#include "gmock/internal/gmock-internal-utils.h"
#include <ctype.h>
#include <ostream> // NOLINT
#include <string>
#include <gmock/gmock.h>
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
#include "gmock/gmock.h"
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
namespace testing {
namespace internal {

View File

@@ -34,8 +34,8 @@
// This file implements Matcher<const string&>, Matcher<string>, and
// utilities for defining matchers.
#include <gmock/gmock-matchers.h>
#include <gmock/gmock-generated-matchers.h>
#include "gmock/gmock-matchers.h"
#include "gmock/gmock-generated-matchers.h"
#include <string.h>
#include <sstream>

View File

@@ -34,15 +34,15 @@
// This file implements the spec builder syntax (ON_CALL and
// EXPECT_CALL).
#include <gmock/gmock-spec-builders.h>
#include "gmock/gmock-spec-builders.h"
#include <stdlib.h>
#include <iostream> // NOLINT
#include <map>
#include <set>
#include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
#include <unistd.h> // NOLINT

View File

@@ -29,8 +29,8 @@
//
// Author: wan@google.com (Zhanyong Wan)
#include <gmock/gmock.h>
#include <gmock/internal/gmock-port.h>
#include "gmock/gmock.h"
#include "gmock/internal/gmock-port.h"
namespace testing {

View File

@@ -30,8 +30,8 @@
// Author: wan@google.com (Zhanyong Wan)
#include <iostream>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#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