gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
include/gmock/gmock-actions.h
View File

@@ -43,8 +43,8 @@
#include <errno.h>
#endif
#include <gmock/internal/gmock-internal-utils.h>
#include <gmock/internal/gmock-port.h>
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
namespace testing {

4
include/gmock/gmock-cardinalities.h
View File

@@ -40,8 +40,8 @@
#include <limits.h>
#include <ostream> // NOLINT
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
namespace testing {

4
include/gmock/gmock-generated-actions.h
View File

@@ -38,8 +38,8 @@
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
#include <gmock/gmock-actions.h>
#include <gmock/internal/gmock-port.h>
#include "gmock/gmock-actions.h"
#include "gmock/internal/gmock-port.h"
namespace testing {
namespace internal {

4
include/gmock/gmock-generated-actions.h.pump
View File

@@ -42,8 +42,8 @@ $$}} This meta comment fixes auto-indentation in editors.
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
#include <gmock/gmock-actions.h>
#include <gmock/internal/gmock-port.h>
#include "gmock/gmock-actions.h"
#include "gmock/internal/gmock-port.h"
namespace testing {
namespace internal {

4
include/gmock/gmock-generated-function-mockers.h
View File

@@ -38,8 +38,8 @@
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
#include <gmock/gmock-spec-builders.h>
#include <gmock/internal/gmock-internal-utils.h>
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h"
namespace testing {
namespace internal {

4
include/gmock/gmock-generated-function-mockers.h.pump
View File

@@ -41,8 +41,8 @@ $var n = 10 $$ The maximum arity we support.
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
#include <gmock/gmock-spec-builders.h>
#include <gmock/internal/gmock-internal-utils.h>
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-internal-utils.h"
namespace testing {
namespace internal {

2
include/gmock/gmock-generated-matchers.h
View File

@@ -41,7 +41,7 @@
#include <sstream>
#include <string>
#include <vector>
#include <gmock/gmock-matchers.h>
#include "gmock/gmock-matchers.h"
namespace testing {
namespace internal {

2
include/gmock/gmock-generated-matchers.h.pump
View File

@@ -43,7 +43,7 @@ $$ }} This line fixes auto-indentation of the following code in Emacs.
#include <sstream>
#include <string>
#include <vector>
#include <gmock/gmock-matchers.h>
#include "gmock/gmock-matchers.h"
namespace testing {
namespace internal {

4
include/gmock/gmock-generated-nice-strict.h
View File

@@ -59,8 +59,8 @@
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
#include <gmock/gmock-spec-builders.h>
#include <gmock/internal/gmock-port.h>
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-port.h"
namespace testing {

4
include/gmock/gmock-generated-nice-strict.h.pump
View File

@@ -62,8 +62,8 @@ $var n = 10 $$ The maximum arity we support.
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
#include <gmock/gmock-spec-builders.h>
#include <gmock/internal/gmock-port.h>
#include "gmock/gmock-spec-builders.h"
#include "gmock/internal/gmock-port.h"
namespace testing {

6
include/gmock/gmock-matchers.h
View File

@@ -46,9 +46,9 @@
#include <utility>
#include <vector>
#include <gmock/internal/gmock-internal-utils.h>
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
namespace testing {

2
include/gmock/gmock-more-actions.h
View File

@@ -36,7 +36,7 @@
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
#include <gmock/gmock-generated-actions.h>
#include "gmock/gmock-generated-actions.h"
namespace testing {
namespace internal {

12
include/gmock/gmock-spec-builders.h
View File

@@ -66,12 +66,12 @@
#include <string>
#include <vector>
#include <gmock/gmock-actions.h>
#include <gmock/gmock-cardinalities.h>
#include <gmock/gmock-matchers.h>
#include <gmock/internal/gmock-internal-utils.h>
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
#include "gmock/gmock-actions.h"
#include "gmock/gmock-cardinalities.h"
#include "gmock/gmock-matchers.h"
#include "gmock/internal/gmock-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
namespace testing {

18
include/gmock/gmock.h
View File

@@ -55,15 +55,15 @@
//
// where all clauses are optional and WillOnce() can be repeated.
#include <gmock/gmock-actions.h>
#include <gmock/gmock-cardinalities.h>
#include <gmock/gmock-generated-actions.h>
#include <gmock/gmock-generated-function-mockers.h>
#include <gmock/gmock-generated-matchers.h>
#include <gmock/gmock-more-actions.h>
#include <gmock/gmock-generated-nice-strict.h>
#include <gmock/gmock-matchers.h>
#include <gmock/internal/gmock-internal-utils.h>
#include "gmock/gmock-actions.h"
#include "gmock/gmock-cardinalities.h"
#include "gmock/gmock-generated-actions.h"
#include "gmock/gmock-generated-function-mockers.h"
#include "gmock/gmock-generated-matchers.h"
#include "gmock/gmock-more-actions.h"
#include "gmock/gmock-generated-nice-strict.h"
#include "gmock/gmock-matchers.h"
#include "gmock/internal/gmock-internal-utils.h"
namespace testing {

2
include/gmock/internal/gmock-generated-internal-utils.h
View File

@@ -39,7 +39,7 @@
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
#include <gmock/internal/gmock-port.h>
#include "gmock/internal/gmock-port.h"
namespace testing {

2
include/gmock/internal/gmock-generated-internal-utils.h.pump
View File

@@ -42,7 +42,7 @@ $var n = 10 $$ The maximum arity we support.
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
#include <gmock/internal/gmock-port.h>
#include "gmock/internal/gmock-port.h"
namespace testing {

6
include/gmock/internal/gmock-internal-utils.h
View File

@@ -42,9 +42,9 @@
#include <ostream> // NOLINT
#include <string>
#include <gmock/internal/gmock-generated-internal-utils.h>
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
#include "gmock/internal/gmock-generated-internal-utils.h"
#include "gmock/internal/gmock-port.h"
#include "gtest/gtest.h"
namespace testing {
namespace internal {

4
include/gmock/internal/gmock-port.h
View File

@@ -42,8 +42,8 @@
// Most of the types needed for porting Google Mock are also required
// for Google Test and are defined in gtest-port.h.
#include <gtest/internal/gtest-linked_ptr.h>
#include <gtest/internal/gtest-port.h>
#include "gtest/internal/gtest-linked_ptr.h"
#include "gtest/internal/gtest-port.h"
// To avoid conditional compilation everywhere, we make it
// gmock-port.h's responsibility to #include the header implementing