diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 15:13:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 15:13:12 (GMT) |
| commit | 21e518557ad7634bc4b1fd57effa7e49a1405bb5 (patch) | |
| tree | 8484ccd28cc1bb4aa27c3b47b9a56cf9ee2ce66c /googletest/include/gtest/gtest-message.h | |
| parent | 3e2cb75446e0f56f226f0fb259e032bb4d014002 (diff) | |
| parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
| download | googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.zip googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.gz googletest-21e518557ad7634bc4b1fd57effa7e49a1405bb5.tar.bz2 | |
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googletest/include/gtest/gtest-message.h')
| -rw-r--r-- | googletest/include/gtest/gtest-message.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h index fe879bc..107a55c 100644 --- a/googletest/include/gtest/gtest-message.h +++ b/googletest/include/gtest/gtest-message.h @@ -26,10 +26,9 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + // -// Author: wan@google.com (Zhanyong Wan) -// -// The Google C++ Testing Framework (Google Test) +// The Google C++ Testing and Mocking Framework (Google Test) // // This header file defines the Message class. // @@ -43,6 +42,8 @@ // to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user // program! +// GOOGLETEST_CM0001 DO NOT DELETE + #ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ #define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ @@ -196,7 +197,6 @@ class GTEST_API_ Message { std::string GetString() const; private: - #if GTEST_OS_SYMBIAN // These are needed as the Nokia Symbian Compiler cannot decide between // const T& and const T* in a function template. The Nokia compiler _can_ |