diff options
| author | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2009-10-21 06:15:34 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386> | 2009-10-21 06:15:34 +0000 |
| commit | 6c54a5e1f91e033fa937be5d647ce43dee597ad8 (patch) | |
| tree | 957c63813fb35aecf11afed11259dd62ac95e3cf /src | |
| parent | 7db42db1c649f1613813385d4a180630ad1dc95a (diff) | |
| download | googletest-6c54a5e1f91e033fa937be5d647ce43dee597ad8.tar.gz googletest-6c54a5e1f91e033fa937be5d647ce43dee597ad8.tar.bz2 googletest-6c54a5e1f91e033fa937be5d647ce43dee597ad8.zip | |
Enables more verbose output for expectations (by Sverre Sundsdal); Fixes information loss warning when compiled by VC8.0 with /Wp64; Skips two tests on Windows Mobile that don't work there.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gmock-spec-builders.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index 6cc94ddd..edd60fec 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -40,6 +40,7 @@ #include <iostream> // NOLINT #include <map> #include <set> +#include <string> #include <gmock/gmock.h> #include <gtest/gtest.h> @@ -55,9 +56,12 @@ namespace internal { Mutex g_gmock_mutex(Mutex::NO_CONSTRUCTOR_NEEDED_FOR_STATIC_MUTEX); // Constructs an ExpectationBase object. -ExpectationBase::ExpectationBase(const char* file, int line) +ExpectationBase::ExpectationBase(const char* file, + int line, + const string& source_text) : file_(file), line_(line), + source_text_(source_text), cardinality_specified_(false), cardinality_(Exactly(1)), call_count_(0), |