external/googlemock.git
2 months agoPull in gtest 692. master
kosak@google.com [Tue, 29 Jul 2014 00:32:54 +0000 (00:32 +0000)]
Pull in gtest 692.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@485 8415998a-534a-0410-bf83-d39667b30386

2 months agoDefines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m,...
kosak@google.com [Mon, 28 Jul 2014 22:57:30 +0000 (22:57 +0000)]
Defines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m, container) but ignores the order of the elements.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@484 8415998a-534a-0410-bf83-d39667b30386

2 months agoPull in gtest 691.
kosak@google.com [Mon, 28 Jul 2014 21:56:12 +0000 (21:56 +0000)]
Pull in gtest 691.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@483 8415998a-534a-0410-bf83-d39667b30386

2 months agoAllows {Unordered,}ElementsAreArray() to accept any STL-style container as the parameter.
kosak@google.com [Mon, 28 Jul 2014 20:01:28 +0000 (20:01 +0000)]
Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the parameter.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@482 8415998a-534a-0410-bf83-d39667b30386

4 months agoPull in gtest 690.
kosak@google.com [Wed, 18 Jun 2014 21:32:14 +0000 (21:32 +0000)]
Pull in gtest 690.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@480 8415998a-534a-0410-bf83-d39667b30386

4 months agoAdd MockFunction::AsStdFunction(). Also pull in gtest 688.
kosak@google.com [Tue, 17 Jun 2014 23:19:54 +0000 (23:19 +0000)]
Add MockFunction::AsStdFunction(). Also pull in gtest 688.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@479 8415998a-534a-0410-bf83-d39667b30386

4 months agoPull in gtest 687.
kosak@google.com [Tue, 17 Jun 2014 22:05:58 +0000 (22:05 +0000)]
Pull in gtest 687.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@478 8415998a-534a-0410-bf83-d39667b30386

5 months agoPush several shanges:
billydonahue@google.com [Mon, 19 May 2014 17:54:51 +0000 (17:54 +0000)]
Push several shanges:

    Make single argument constructors explicit in macros.

    Remove NOMINMAX macro.

    Add macros for disabling Microsoft Visual C++ warnings.

    Add WhenDynamicCastTo<T> matcher.
    A matcher that matches a pointer that matches inner_matcher when
    dynamic_cast<T> is applied.

    Add IWYU export pragmas to the tuple include lines.

    Fix NativeArray to not require a copy constructor unless we ask for one.
    This allows ElementsAre() to support non-copyable types.

    Examine WINAPI_FAMILY_PARTITION macros to better distinguish windows platforms.
    Author: martin@martin.st
    From: https://codereview.appspot.com/57220043/

git-svn-id: http://googlemock.googlecode.com/svn/trunk@477 8415998a-534a-0410-bf83-d39667b30386

6 months agoExport tuple and friends in the ::testing namespace.
kosak@google.com [Wed, 2 Apr 2014 20:30:00 +0000 (20:30 +0000)]
Export tuple and friends in the ::testing namespace.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@472 8415998a-534a-0410-bf83-d39667b30386

7 months agoImplement threading support for gmock on Windows.
kosak@google.com [Mon, 24 Mar 2014 22:08:24 +0000 (22:08 +0000)]
Implement threading support for gmock on Windows.
Replace U+2013 with U+002D in comment lines.
Pull in gtest 681.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@471 8415998a-534a-0410-bf83-d39667b30386

7 months agoMake the gmock generator work with the 'override' keyword. Also pull in gtest 680.
kosak@google.com [Wed, 12 Mar 2014 23:27:35 +0000 (23:27 +0000)]
Make the gmock generator work with the 'override' keyword. Also pull in gtest 680.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@470 8415998a-534a-0410-bf83-d39667b30386

7 months agoIntroduce a BeginEndDistanceIs matcher for containers such as std::forward_list
kosak@google.com [Wed, 12 Mar 2014 21:06:46 +0000 (21:06 +0000)]
Introduce a BeginEndDistanceIs matcher for containers such as std::forward_list
which lack a size() member.

Also pull in gtest 678.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@469 8415998a-534a-0410-bf83-d39667b30386

8 months agoSuppress "Conditional expression is constant" warning on Visual Studio.
kosak@google.com [Wed, 29 Jan 2014 07:30:13 +0000 (07:30 +0000)]
Suppress "Conditional expression is constant" warning on Visual Studio.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@468 8415998a-534a-0410-bf83-d39667b30386

8 months agoSupport mocking methods with move-only return types.
kosak@google.com [Wed, 29 Jan 2014 06:41:44 +0000 (06:41 +0000)]
Support mocking methods with move-only return types.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@467 8415998a-534a-0410-bf83-d39667b30386

9 months agoMake Google Mock build cleanly on Visual Studio 2010, 2012, 2013.
kosak@google.com [Mon, 13 Jan 2014 22:28:01 +0000 (22:28 +0000)]
Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@466 8415998a-534a-0410-bf83-d39667b30386

9 months agoAdds a note in the "uninteresting mock method call" warning to advise people how...
kosak@google.com [Sun, 12 Jan 2014 23:42:34 +0000 (23:42 +0000)]
Adds a note in the "uninteresting mock method call" warning to advise people how to handle the warning.
Clarifies the purpose of utilities in gmock-port.h and adds guidance w.r.t. gmock-port.h vs gtest-port.h.
Pulls in gtest r674.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@465 8415998a-534a-0410-bf83-d39667b30386

10 months agoDistinguish between C++11 language and library support for <initializer_list>.
kosak@google.com [Wed, 4 Dec 2013 23:49:07 +0000 (23:49 +0000)]
Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
Pull in gtest 671.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@463 8415998a-534a-0410-bf83-d39667b30386

10 months agoFix warnings encountered with clang -Wall, and pull in gtest 670.
kosak@google.com [Tue, 3 Dec 2013 23:19:36 +0000 (23:19 +0000)]
Fix warnings encountered with clang -Wall, and pull in gtest 670.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@462 8415998a-534a-0410-bf83-d39667b30386

10 months agoClarify the rationale for gmock_all_test.cc, and pull in gtest 669
kosak@google.com [Tue, 3 Dec 2013 22:46:51 +0000 (22:46 +0000)]
Clarify the rationale for gmock_all_test.cc, and pull in gtest 669

git-svn-id: http://googlemock.googlecode.com/svn/trunk@461 8415998a-534a-0410-bf83-d39667b30386

10 months agopulls in gtest r668
kosak@google.com [Tue, 3 Dec 2013 02:01:03 +0000 (02:01 +0000)]
pulls in gtest r668

git-svn-id: http://googlemock.googlecode.com/svn/trunk@460 8415998a-534a-0410-bf83-d39667b30386

10 months agoDon't copy the argument in SafeMatcherCast because it's not safe.
kosak@google.com [Tue, 3 Dec 2013 01:43:07 +0000 (01:43 +0000)]
Don't copy the argument in SafeMatcherCast because it's not safe.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@459 8415998a-534a-0410-bf83-d39667b30386

11 months agoadds gmock_doctor.py to the distro
zhanyong.wan [Thu, 21 Nov 2013 18:38:42 +0000 (18:38 +0000)]
adds gmock_doctor.py to the distro

git-svn-id: http://googlemock.googlecode.com/svn/trunk@455 8415998a-534a-0410-bf83-d39667b30386

13 months agoavoids clash with the max() macro on Windows
zhanyong.wan [Wed, 18 Sep 2013 17:51:08 +0000 (17:51 +0000)]
avoids clash with the max() macro on Windows

git-svn-id: http://googlemock.googlecode.com/svn/trunk@451 8415998a-534a-0410-bf83-d39667b30386

13 months agofixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS
zhanyong.wan [Mon, 16 Sep 2013 05:50:53 +0000 (05:50 +0000)]
fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS

git-svn-id: http://googlemock.googlecode.com/svn/trunk@450 8415998a-534a-0410-bf83-d39667b30386

13 months agomakes googlemock generator handle some class templates; pulls in gtest r662
zhanyong.wan [Fri, 6 Sep 2013 22:52:14 +0000 (22:52 +0000)]
makes googlemock generator handle some class templates; pulls in gtest r662

git-svn-id: http://googlemock.googlecode.com/svn/trunk@449 8415998a-534a-0410-bf83-d39667b30386

13 months agoadds more files to gmock's distro
zhanyong.wan [Tue, 27 Aug 2013 21:31:58 +0000 (21:31 +0000)]
adds more files to gmock's distro

git-svn-id: http://googlemock.googlecode.com/svn/trunk@448 8415998a-534a-0410-bf83-d39667b30386

13 months agofixes a typo
zhanyong.wan [Tue, 27 Aug 2013 21:04:16 +0000 (21:04 +0000)]
fixes a typo

git-svn-id: http://googlemock.googlecode.com/svn/trunk@446 8415998a-534a-0410-bf83-d39667b30386

13 months agoadds gmock-more-matchers.h to the distro
zhanyong.wan [Tue, 27 Aug 2013 20:56:21 +0000 (20:56 +0000)]
adds gmock-more-matchers.h to the distro

git-svn-id: http://googlemock.googlecode.com/svn/trunk@445 8415998a-534a-0410-bf83-d39667b30386

13 months agopulls in gtest r661
zhanyong.wan [Tue, 27 Aug 2013 20:35:46 +0000 (20:35 +0000)]
pulls in gtest r661

git-svn-id: http://googlemock.googlecode.com/svn/trunk@444 8415998a-534a-0410-bf83-d39667b30386

14 months agoMakes some container matchers accept initializer lists in C++11 mode and work with...
zhanyong.wan [Thu, 8 Aug 2013 18:41:51 +0000 (18:41 +0000)]
Makes some container matchers accept initializer lists in C++11 mode and work with stream-like containers that don't have size() or empty(); exposes StringMatchResultListener for defining composite matchers.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@443 8415998a-534a-0410-bf83-d39667b30386

14 months agoMakes UnorderedElementsAre*() work with containers that don't have size() or empty().
zhanyong.wan [Tue, 30 Jul 2013 06:16:21 +0000 (06:16 +0000)]
Makes UnorderedElementsAre*() work with containers that don't have size() or empty().

git-svn-id: http://googlemock.googlecode.com/svn/trunk@441 8415998a-534a-0410-bf83-d39667b30386

14 months agoAdds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in
zhanyong.wan [Sun, 28 Jul 2013 08:24:00 +0000 (08:24 +0000)]
Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in
gtest r660.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@438 8415998a-534a-0410-bf83-d39667b30386

16 months agoFixes uses of pair to std::pair; pulls in gtest r655.
zhanyong.wan [Thu, 20 Jun 2013 18:59:15 +0000 (18:59 +0000)]
Fixes uses of pair to std::pair; pulls in gtest r655.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@437 8415998a-534a-0410-bf83-d39667b30386

16 months agoNew floating-point matchers: DoubleNear() and friends;
zhanyong.wan [Tue, 18 Jun 2013 18:49:51 +0000 (18:49 +0000)]
New floating-point matchers: DoubleNear() and friends;
AllOf() and AnyOf() can accept any number of arguments now in C++11 mode.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@433 8415998a-534a-0410-bf83-d39667b30386

18 months agoMakes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653
zhanyong.wan [Wed, 24 Apr 2013 02:49:43 +0000 (02:49 +0000)]
Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653

git-svn-id: http://googlemock.googlecode.com/svn/trunk@432 8415998a-534a-0410-bf83-d39667b30386

18 months agoUpdates version number to 1.7.0
zhanyong.wan [Sun, 7 Apr 2013 03:16:38 +0000 (03:16 +0000)]
Updates version number to 1.7.0

git-svn-id: http://googlemock.googlecode.com/svn/trunk@430 8415998a-534a-0410-bf83-d39667b30386

18 months agoFixes some compatibility issues with STLport.
zhanyong.wan [Thu, 4 Apr 2013 22:45:59 +0000 (22:45 +0000)]
Fixes some compatibility issues with STLport.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@429 8415998a-534a-0410-bf83-d39667b30386

18 months agoMakes WhenSorted() support associative containers (by billydonahue@google.com).
zhanyong.wan [Wed, 27 Mar 2013 16:14:55 +0000 (16:14 +0000)]
Makes WhenSorted() support associative containers (by billydonahue@google.com).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@427 8415998a-534a-0410-bf83-d39667b30386

19 months agoAdds special support for matching StringPiece. Pulls in gtest r646.
zhanyong.wan [Mon, 25 Mar 2013 16:27:03 +0000 (16:27 +0000)]
Adds special support for matching StringPiece.  Pulls in gtest r646.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@426 8415998a-534a-0410-bf83-d39667b30386

19 months agoRemoves an unnecessary semi-colon, which causes a warning in GCC's pedantic mode.
zhanyong.wan [Fri, 8 Mar 2013 17:53:24 +0000 (17:53 +0000)]
Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic mode.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@425 8415998a-534a-0410-bf83-d39667b30386

19 months agoAdds a cmake target for gmock_ex_test; also fixes name shadowing warnings.
zhanyong.wan [Fri, 1 Mar 2013 21:28:40 +0000 (21:28 +0000)]
Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@424 8415998a-534a-0410-bf83-d39667b30386

19 months agoImproves the tests for nice, naggy, and strict mocks.
zhanyong.wan [Fri, 1 Mar 2013 07:10:07 +0000 (07:10 +0000)]
Improves the tests for nice, naggy, and strict mocks.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@422 8415998a-534a-0410-bf83-d39667b30386

19 months agoAllows the return type of a mock method to contain unprotected commas.
zhanyong.wan [Fri, 1 Mar 2013 06:58:38 +0000 (06:58 +0000)]
Allows the return type of a mock method to contain unprotected commas.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@421 8415998a-534a-0410-bf83-d39667b30386

19 months agoRemoves unused variables and functions.
zhanyong.wan [Fri, 1 Mar 2013 06:53:35 +0000 (06:53 +0000)]
Removes unused variables and functions.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@420 8415998a-534a-0410-bf83-d39667b30386

19 months agoImplements NaggyMock.
zhanyong.wan [Fri, 1 Mar 2013 01:54:22 +0000 (01:54 +0000)]
Implements NaggyMock.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@419 8415998a-534a-0410-bf83-d39667b30386

19 months agoImplements matcher SizeIs().
zhanyong.wan [Fri, 1 Mar 2013 01:50:17 +0000 (01:50 +0000)]
Implements matcher SizeIs().

git-svn-id: http://googlemock.googlecode.com/svn/trunk@418 8415998a-534a-0410-bf83-d39667b30386

19 months agoClarifies how to implement MatcherInterface.
zhanyong.wan [Fri, 1 Mar 2013 01:47:35 +0000 (01:47 +0000)]
Clarifies how to implement MatcherInterface.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@417 8415998a-534a-0410-bf83-d39667b30386

19 months agoImplements matcher IsEmpty(); also pulls in gtest r643.
zhanyong.wan [Fri, 1 Mar 2013 00:20:30 +0000 (00:20 +0000)]
Implements matcher IsEmpty(); also pulls in gtest r643.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@416 8415998a-534a-0410-bf83-d39667b30386

19 months agoMakes googlemock throw a runtime_error instead of abort when a mock
zhanyong.wan [Thu, 28 Feb 2013 22:58:51 +0000 (22:58 +0000)]
Makes googlemock throw a runtime_error instead of abort when a mock
method with no default value is invoked (if exceptions are enabled).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@415 8415998a-534a-0410-bf83-d39667b30386

19 months agoPulls in gtest r639, which fixes dangling reference in make/cmake files.
zhanyong.wan [Wed, 27 Feb 2013 18:54:05 +0000 (18:54 +0000)]
Pulls in gtest r639, which fixes dangling reference in make/cmake files.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@414 8415998a-534a-0410-bf83-d39667b30386

19 months agoAdds -pthread and switches -I to -isystem in build instructions;
zhanyong.wan [Wed, 27 Feb 2013 17:53:45 +0000 (17:53 +0000)]
Adds -pthread and switches -I to -isystem in build instructions;
also pulls in the latest gtest revision (r638).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@413 8415998a-534a-0410-bf83-d39667b30386

20 months agoAdds the LICENSE file to the distribution.
vladlosev [Thu, 31 Jan 2013 19:53:54 +0000 (19:53 +0000)]
Adds the LICENSE file to the distribution.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@412 8415998a-534a-0410-bf83-d39667b30386

23 months agoUnfortunately, the svn repo is a bit out of date. This commit contains 8
jgm@google.com [Thu, 15 Nov 2012 15:50:36 +0000 (15:50 +0000)]
Unfortunately, the svn repo is a bit out of date. This commit contains 8
changes that haven't made it to svn. The descriptions of each change are listed
below.

- Fixes some python shebang lines.

- Add ElementsAreArray overloads to gmock. ElementsAreArray now makes a copy of
  its input elements before the conversion to a Matcher. ElementsAreArray can
  now take a vector as input. ElementsAreArray can now take an iterator pair as
  input.

- Templatize MatchAndExplain to allow independent string types for the matcher
  and matchee. I also templatized the ConstCharPointer version of
  MatchAndExplain to avoid calls with "char*" from using the new templated
  MatchAndExplain.

- Fixes the bug where the constructor of the return type of ElementsAre() saves
  a reference instead of a copy of the arguments.

- Extends ElementsAre() to accept arrays whose sizes aren't known.

- Switches gTest's internal FilePath class from testing::internal::String to
  std::string. testing::internal::String was introduced when gTest couldn't
  depend on std::string.  It's now deprecated.

- Switches gTest & gMock from using testing::internal::String objects to
  std::string. Some static methods of String are still in use.  We may be able
  to remove some but not all of them.  In particular, String::Format() should
  eventually be removed as it truncates the result at 4096 characters, often
  causing problems.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@410 8415998a-534a-0410-bf83-d39667b30386

2 years agoMakes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin).
vladlosev [Tue, 14 Aug 2012 15:38:49 +0000 (15:38 +0000)]
Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@408 8415998a-534a-0410-bf83-d39667b30386

2 years agoPulls in gtest r615.
zhanyong.wan [Thu, 31 May 2012 20:40:56 +0000 (20:40 +0000)]
Pulls in gtest r615.

Renames internal enums to the kFoo naming style.

Fixes gmock doctor to work with newer versions of Clang.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@407 8415998a-534a-0410-bf83-d39667b30386

2 years agoReduced template instantiation depth for the AllOf and AnyOf matchers. Also some...
jgm@google.com [Tue, 10 Apr 2012 16:02:11 +0000 (16:02 +0000)]
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@405 8415998a-534a-0410-bf83-d39667b30386

3 years agoFixes a lock reentrancy when destroying a mock causes destruction of another mock... git-svn
vladlosev [Mon, 24 Oct 2011 23:41:07 +0000 (23:41 +0000)]
Fixes a lock reentrancy when destroying a mock causes destruction of another mock (issue 79) (by Aaron Jacobs).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@403 8415998a-534a-0410-bf83-d39667b30386

3 years agoExpressed the thread-safety annotations in code, replacing the existing comment-based...
vladlosev [Mon, 24 Oct 2011 21:16:22 +0000 (21:16 +0000)]
Expressed the thread-safety annotations in code, replacing the existing comment-based system (by Aaron Jacobs).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@402 8415998a-534a-0410-bf83-d39667b30386

3 years agoFixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg Miller).
vladlosev [Mon, 24 Oct 2011 17:48:54 +0000 (17:48 +0000)]
Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg Miller).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@401 8415998a-534a-0410-bf83-d39667b30386

3 years agoModifies gmock_doctor.py to work with GCC output that contains file:line:char positio...
vladlosev [Wed, 28 Sep 2011 18:32:59 +0000 (18:32 +0000)]
Modifies gmock_doctor.py to work with GCC output that contains file:line:char positions and left and right quote characters (U+2018 and U+2019) instead of apostrophes (U+0027).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@399 8415998a-534a-0410-bf83-d39667b30386

3 years agoImplements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595.
zhanyong.wan [Fri, 16 Sep 2011 16:45:39 +0000 (16:45 +0000)]
Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@397 8415998a-534a-0410-bf83-d39667b30386

3 years agoRenames the license files.
vladlosev [Fri, 9 Sep 2011 07:06:32 +0000 (07:06 +0000)]
Renames the license files.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@396 8415998a-534a-0410-bf83-d39667b30386

3 years agoMore Clang support improvements in Google Mock Doctor.
vladlosev [Thu, 25 Aug 2011 21:35:10 +0000 (21:35 +0000)]
More Clang support improvements in Google Mock Doctor.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@395 8415998a-534a-0410-bf83-d39667b30386

3 years agoImproves support for Clang in Google Mock Doctor.
vladlosev [Tue, 16 Aug 2011 00:51:14 +0000 (00:51 +0000)]
Improves support for Clang in Google Mock Doctor.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@394 8415998a-534a-0410-bf83-d39667b30386

3 years agoFixes issue 139 and issue 140.
vladlosev [Fri, 20 May 2011 21:44:14 +0000 (21:44 +0000)]
Fixes issue 139 and issue 140.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@393 8415998a-534a-0410-bf83-d39667b30386

3 years agoAdds a DLL-related section to Google Mock's README.
vladlosev [Fri, 20 May 2011 21:15:36 +0000 (21:15 +0000)]
Adds a DLL-related section to Google Mock's README.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@392 8415998a-534a-0410-bf83-d39667b30386

3 years agoAdds support for building Google Mock as a shared library (DLL).
vladlosev [Fri, 20 May 2011 00:42:22 +0000 (00:42 +0000)]
Adds support for building Google Mock as a shared library (DLL).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@391 8415998a-534a-0410-bf83-d39667b30386

3 years agoA test to verify correcteness of Google Mock on multiple threads.
vladlosev [Wed, 11 May 2011 08:18:45 +0000 (08:18 +0000)]
A test to verify correcteness of Google Mock on multiple threads.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@390 8415998a-534a-0410-bf83-d39667b30386

3 years agoMakes generation of fused sources contingent on availability of Python and pulls...
vladlosev [Thu, 21 Apr 2011 21:56:01 +0000 (21:56 +0000)]
Makes generation of fused sources contingent on availability of Python and pulls in gtest r580.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@388 8415998a-534a-0410-bf83-d39667b30386

3 years agopulls in gtest r572
zhanyong.wan [Fri, 15 Apr 2011 19:53:42 +0000 (19:53 +0000)]
pulls in gtest r572

git-svn-id: http://googlemock.googlecode.com/svn/trunk@384 8415998a-534a-0410-bf83-d39667b30386

3 years agosimplifies TrulyMatcher and adds a test for it
zhanyong.wan [Thu, 14 Apr 2011 19:37:06 +0000 (19:37 +0000)]
simplifies TrulyMatcher and adds a test for it

git-svn-id: http://googlemock.googlecode.com/svn/trunk@383 8415998a-534a-0410-bf83-d39667b30386

3 years agoDocuments latest changes and pulls in gtest r570
zhanyong.wan [Thu, 14 Apr 2011 07:49:05 +0000 (07:49 +0000)]
Documents latest changes and pulls in gtest r570

git-svn-id: http://googlemock.googlecode.com/svn/trunk@382 8415998a-534a-0410-bf83-d39667b30386

3 years agoUpdates conditional directives to be consistent with the rest of the project.
vladlosev [Thu, 14 Apr 2011 02:42:15 +0000 (02:42 +0000)]
Updates conditional directives to be consistent with the rest of the project.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@381 8415998a-534a-0410-bf83-d39667b30386

3 years agoCorrects condition to compile out MSVC's pragmas. This fixes the build on MinGW.
vladlosev [Wed, 13 Apr 2011 22:12:00 +0000 (22:12 +0000)]
Corrects condition to compile out MSVC's pragmas. This fixes the build on MinGW.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@380 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r569
zhanyong.wan [Tue, 12 Apr 2011 21:06:18 +0000 (21:06 +0000)]
Pulls in gtest r569

git-svn-id: http://googlemock.googlecode.com/svn/trunk@379 8415998a-534a-0410-bf83-d39667b30386

3 years agoRemoves commas from last items in enums (a C++ standard compliance fix).
vladlosev [Fri, 8 Apr 2011 01:32:32 +0000 (01:32 +0000)]
Removes commas from last items in enums (a C++ standard compliance fix).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@378 8415998a-534a-0410-bf83-d39667b30386

3 years agodisables 'make install'
zhanyong.wan [Thu, 7 Apr 2011 07:37:28 +0000 (07:37 +0000)]
disables 'make install'

git-svn-id: http://googlemock.googlecode.com/svn/trunk@377 8415998a-534a-0410-bf83-d39667b30386

3 years agofixes link errors in 'make check'
zhanyong.wan [Thu, 7 Apr 2011 07:19:40 +0000 (07:19 +0000)]
fixes link errors in 'make check'

git-svn-id: http://googlemock.googlecode.com/svn/trunk@376 8415998a-534a-0410-bf83-d39667b30386

3 years agopulls in gtest r562
zhanyong.wan [Thu, 7 Apr 2011 07:18:11 +0000 (07:18 +0000)]
pulls in gtest r562

git-svn-id: http://googlemock.googlecode.com/svn/trunk@375 8415998a-534a-0410-bf83-d39667b30386

3 years agoChanges diagnostic output of the question mark from '\?' to '?'.
vladlosev [Fri, 1 Apr 2011 21:58:42 +0000 (21:58 +0000)]
Changes diagnostic output of the question mark from '\?' to '?'.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@374 8415998a-534a-0410-bf83-d39667b30386

3 years agoFixes Google Mock Doctor affected by the latest tweaks to Clang.
vladlosev [Tue, 29 Mar 2011 22:29:51 +0000 (22:29 +0000)]
Fixes Google Mock Doctor affected by the latest tweaks to Clang.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@372 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r555.
zhanyong.wan [Wed, 16 Mar 2011 17:12:03 +0000 (17:12 +0000)]
Pulls in gtest r555.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@371 8415998a-534a-0410-bf83-d39667b30386

3 years agoPrevents ADL in AllOf() and AnyOf() (by Manuel Klimek).
zhanyong.wan [Wed, 16 Mar 2011 17:10:39 +0000 (17:10 +0000)]
Prevents ADL in AllOf() and AnyOf() (by Manuel Klimek).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@370 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r554.
zhanyong.wan [Wed, 9 Mar 2011 01:18:37 +0000 (01:18 +0000)]
Pulls in gtest r554.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@369 8415998a-534a-0410-bf83-d39667b30386

3 years agoDisables SetArgPointee("string literal") for GCC 4.0- and Symbian, and
zhanyong.wan [Wed, 9 Mar 2011 01:18:08 +0000 (01:18 +0000)]
Disables SetArgPointee("string literal") for GCC 4.0- and Symbian, and
adds support for SetArgPointee(L"wide string literal") -- by Vlad Losev.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@368 8415998a-534a-0410-bf83-d39667b30386

3 years agoAdds CMake scripts to gmock's release package.
zhanyong.wan [Thu, 24 Feb 2011 21:59:54 +0000 (21:59 +0000)]
Adds CMake scripts to gmock's release package.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@367 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r550.
zhanyong.wan [Thu, 24 Feb 2011 21:40:04 +0000 (21:40 +0000)]
Pulls in gtest r550.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@366 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r549.
zhanyong.wan [Thu, 24 Feb 2011 20:51:45 +0000 (20:51 +0000)]
Pulls in gtest r549.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@365 8415998a-534a-0410-bf83-d39667b30386

3 years agoDeletes the empty scons directory.
zhanyong.wan [Thu, 24 Feb 2011 20:27:15 +0000 (20:27 +0000)]
Deletes the empty scons directory.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@364 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r548.
zhanyong.wan [Thu, 24 Feb 2011 20:26:50 +0000 (20:26 +0000)]
Pulls in gtest r548.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@363 8415998a-534a-0410-bf83-d39667b30386

3 years agoChanges gmock's version to 1.6.0 and adds release notes.
zhanyong.wan [Thu, 24 Feb 2011 07:31:48 +0000 (07:31 +0000)]
Changes gmock's version to 1.6.0 and adds release notes.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@362 8415998a-534a-0410-bf83-d39667b30386

3 years agoIndents preprocessor directives.
zhanyong.wan [Thu, 24 Feb 2011 07:29:13 +0000 (07:29 +0000)]
Indents preprocessor directives.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@361 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r544.
zhanyong.wan [Wed, 23 Feb 2011 19:41:42 +0000 (19:41 +0000)]
Pulls in gtest r544.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@360 8415998a-534a-0410-bf83-d39667b30386

3 years agoMakes Google Mock compile much faster and use much less memory; reviewed by Nico...
zhanyong.wan [Wed, 23 Feb 2011 19:39:27 +0000 (19:39 +0000)]
Makes Google Mock compile much faster and use much less memory; reviewed by Nico Weber.  This fixes issue 68.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@359 8415998a-534a-0410-bf83-d39667b30386

3 years agoAdds project files for MSVC 2010 (by Fredrik Roubert).
vladlosev [Sat, 12 Feb 2011 01:56:45 +0000 (01:56 +0000)]
Adds project files for MSVC 2010 (by Fredrik Roubert).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@357 8415998a-534a-0410-bf83-d39667b30386

3 years agoImproves cross-platform compatibility of gmock output. This fixes issue 135.
vladlosev [Fri, 11 Feb 2011 23:50:38 +0000 (23:50 +0000)]
Improves cross-platform compatibility of gmock output. This fixes issue 135.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@356 8415998a-534a-0410-bf83-d39667b30386

3 years agoPulls in gtest r539.
zhanyong.wan [Wed, 2 Feb 2011 01:26:38 +0000 (01:26 +0000)]
Pulls in gtest r539.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@355 8415998a-534a-0410-bf83-d39667b30386

3 years agoPicks up gtest r536; renames implicit_cast and down_cast to reduce the chance of...
zhanyong.wan [Tue, 1 Feb 2011 00:00:03 +0000 (00:00 +0000)]
Picks up gtest r536; renames implicit_cast and down_cast to reduce the chance of clash (by Roman Perepelitsa); enables gmock_gen.py to handle storage specifiers (by Steve Fox).

git-svn-id: http://googlemock.googlecode.com/svn/trunk@354 8415998a-534a-0410-bf83-d39667b30386

3 years agoEnables SetArgPointee<>() to accept a string literal; removes a self-assignment warni...
zhanyong.wan [Thu, 2 Dec 2010 23:30:50 +0000 (23:30 +0000)]
Enables SetArgPointee<>() to accept a string literal; removes a self-assignment warning; teaches gmock doctor to diagnose TTB with Clang; picks up gtest r525.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@352 8415998a-534a-0410-bf83-d39667b30386

3 years agoAdds comment clarifying the use of default-constructed matchers.
vladlosev [Wed, 17 Nov 2010 23:29:21 +0000 (23:29 +0000)]
Adds comment clarifying the use of default-constructed matchers.

git-svn-id: http://googlemock.googlecode.com/svn/trunk@348 8415998a-534a-0410-bf83-d39667b30386