@@ -94,7 +94,7 @@ Google Test):
 | 
				
			|||||||
 * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
 | 
					 * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
 | 
				
			||||||
 * New feature: ACTION_TEMPLATE for defining templatized actions.
 | 
					 * New feature: ACTION_TEMPLATE for defining templatized actions.
 | 
				
			||||||
 * New feature: the .After() clause for specifying expectation order.
 | 
					 * New feature: the .After() clause for specifying expectation order.
 | 
				
			||||||
 * New feature: the .With() clause for for specifying inter-argument
 | 
					 * New feature: the .With() clause for specifying inter-argument
 | 
				
			||||||
   constraints.
 | 
					   constraints.
 | 
				
			||||||
 * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
 | 
					 * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
 | 
				
			||||||
   DeleteArg<k>().
 | 
					   DeleteArg<k>().
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -288,7 +288,7 @@ class MaxBipartiteMatchState {
 | 
				
			|||||||
  // Each element of the left_ vector represents a left hand side node
 | 
					  // Each element of the left_ vector represents a left hand side node
 | 
				
			||||||
  // (i.e. an element) and each element of right_ is a right hand side
 | 
					  // (i.e. an element) and each element of right_ is a right hand side
 | 
				
			||||||
  // node (i.e. a matcher). The values in the left_ vector indicate
 | 
					  // node (i.e. a matcher). The values in the left_ vector indicate
 | 
				
			||||||
  // outflow from that node to a node on the the right_ side. The values
 | 
					  // outflow from that node to a node on the right_ side. The values
 | 
				
			||||||
  // in the right_ indicate inflow, and specify which left_ node is
 | 
					  // in the right_ indicate inflow, and specify which left_ node is
 | 
				
			||||||
  // feeding that right_ node, if any. For example, left_[3] == 1 means
 | 
					  // feeding that right_ node, if any. For example, left_[3] == 1 means
 | 
				
			||||||
  // there's a flow from element #3 to matcher #1. Such a flow would also
 | 
					  // there's a flow from element #3 to matcher #1. Such a flow would also
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1120,7 +1120,7 @@ TEST(ActionTemplateTest, WorksForIntegralTemplateParams) {
 | 
				
			|||||||
  EXPECT_FALSE(b);  // Verifies that resetter is deleted.
 | 
					  EXPECT_FALSE(b);  // Verifies that resetter is deleted.
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Tests that ACTION_TEMPLATES works for template template parameters.
 | 
					// Tests that ACTION_TEMPLATES works for template parameters.
 | 
				
			||||||
ACTION_TEMPLATE(ReturnSmartPointer,
 | 
					ACTION_TEMPLATE(ReturnSmartPointer,
 | 
				
			||||||
                HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class,
 | 
					                HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class,
 | 
				
			||||||
                                      Pointer),
 | 
					                                      Pointer),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -675,7 +675,7 @@ syntax only.
 | 
				
			|||||||
## How It Works ##
 | 
					## How It Works ##
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
					Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
				
			||||||
death test statement in that process. The details of of how precisely
 | 
					death test statement in that process. The details of how precisely
 | 
				
			||||||
that happens depend on the platform and the variable
 | 
					that happens depend on the platform and the variable
 | 
				
			||||||
`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
					`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
				
			||||||
command-line flag `--gtest_death_test_style`).
 | 
					command-line flag `--gtest_death_test_style`).
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -599,7 +599,7 @@ syntax only.
 | 
				
			|||||||
## How It Works ##
 | 
					## How It Works ##
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
					Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
				
			||||||
death test statement in that process. The details of of how precisely
 | 
					death test statement in that process. The details of how precisely
 | 
				
			||||||
that happens depend on the platform and the variable
 | 
					that happens depend on the platform and the variable
 | 
				
			||||||
`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
					`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
				
			||||||
command-line flag `--gtest_death_test_style`).
 | 
					command-line flag `--gtest_death_test_style`).
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -672,7 +672,7 @@ syntax only.
 | 
				
			|||||||
## How It Works ##
 | 
					## How It Works ##
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
					Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
				
			||||||
death test statement in that process. The details of of how precisely
 | 
					death test statement in that process. The details of how precisely
 | 
				
			||||||
that happens depend on the platform and the variable
 | 
					that happens depend on the platform and the variable
 | 
				
			||||||
`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
					`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
				
			||||||
command-line flag `--gtest_death_test_style`).
 | 
					command-line flag `--gtest_death_test_style`).
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -673,7 +673,7 @@ syntax only.
 | 
				
			|||||||
## How It Works ##
 | 
					## How It Works ##
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
					Under the hood, `ASSERT_EXIT()` spawns a new process and executes the
 | 
				
			||||||
death test statement in that process. The details of of how precisely
 | 
					death test statement in that process. The details of how precisely
 | 
				
			||||||
that happens depend on the platform and the variable
 | 
					that happens depend on the platform and the variable
 | 
				
			||||||
`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
					`::testing::GTEST_FLAG(death_test_style)` (which is initialized from the
 | 
				
			||||||
command-line flag `--gtest_death_test_style`).
 | 
					command-line flag `--gtest_death_test_style`).
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1243,7 +1243,7 @@ int GetStatusFileDescriptor(unsigned int parent_process_id,
 | 
				
			|||||||
      reinterpret_cast<HANDLE>(write_handle_as_size_t);
 | 
					      reinterpret_cast<HANDLE>(write_handle_as_size_t);
 | 
				
			||||||
  HANDLE dup_write_handle;
 | 
					  HANDLE dup_write_handle;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // The newly initialized handle is accessible only in in the parent
 | 
					  // The newly initialized handle is accessible only in the parent
 | 
				
			||||||
  // process. To obtain one accessible within the child, we need to use
 | 
					  // process. To obtain one accessible within the child, we need to use
 | 
				
			||||||
  // DuplicateHandle.
 | 
					  // DuplicateHandle.
 | 
				
			||||||
  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
 | 
					  if (!::DuplicateHandle(parent_process_handle.Get(), write_handle,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -496,7 +496,7 @@ class ThreadLocalRegistryImpl {
 | 
				
			|||||||
                                 FALSE,
 | 
					                                 FALSE,
 | 
				
			||||||
                                 thread_id);
 | 
					                                 thread_id);
 | 
				
			||||||
    GTEST_CHECK_(thread != NULL);
 | 
					    GTEST_CHECK_(thread != NULL);
 | 
				
			||||||
    // We need to to pass a valid thread ID pointer into CreateThread for it
 | 
					    // We need to pass a valid thread ID pointer into CreateThread for it
 | 
				
			||||||
    // to work correctly under Win98.
 | 
					    // to work correctly under Win98.
 | 
				
			||||||
    DWORD watcher_thread_id;
 | 
					    DWORD watcher_thread_id;
 | 
				
			||||||
    HANDLE watcher_thread = ::CreateThread(
 | 
					    HANDLE watcher_thread = ::CreateThread(
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1784,7 +1784,7 @@ std::string CodePointToUtf8(UInt32 code_point) {
 | 
				
			|||||||
  return str;
 | 
					  return str;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// The following two functions only make sense if the the system
 | 
					// The following two functions only make sense if the system
 | 
				
			||||||
// uses UTF-16 for wide string encoding. All supported systems
 | 
					// uses UTF-16 for wide string encoding. All supported systems
 | 
				
			||||||
// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
 | 
					// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1388,7 +1388,7 @@ class TestResultTest : public Test {
 | 
				
			|||||||
    delete r2;
 | 
					    delete r2;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // Helper that compares two two TestPartResults.
 | 
					  // Helper that compares two TestPartResults.
 | 
				
			||||||
  static void CompareTestPartResult(const TestPartResult& expected,
 | 
					  static void CompareTestPartResult(const TestPartResult& expected,
 | 
				
			||||||
                                    const TestPartResult& actual) {
 | 
					                                    const TestPartResult& actual) {
 | 
				
			||||||
    EXPECT_EQ(expected.type(), actual.type());
 | 
					    EXPECT_EQ(expected.type(), actual.type());
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -88,7 +88,7 @@ file_data = """//
 | 
				
			|||||||
// is executed in a "Run Script" build phase when creating gtest.framework. This
 | 
					// is executed in a "Run Script" build phase when creating gtest.framework. This
 | 
				
			||||||
// header file is not used during compilation of C-source. Rather, it simply
 | 
					// header file is not used during compilation of C-source. Rather, it simply
 | 
				
			||||||
// defines some version strings for substitution in the Info.plist. Because of
 | 
					// defines some version strings for substitution in the Info.plist. Because of
 | 
				
			||||||
// this, we are not not restricted to C-syntax nor are we using include guards.
 | 
					// this, we are not restricted to C-syntax nor are we using include guards.
 | 
				
			||||||
//
 | 
					//
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define GTEST_VERSIONINFO_SHORT %s.%s
 | 
					#define GTEST_VERSIONINFO_SHORT %s.%s
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user