diff options
author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-11-26 20:48:45 +0000 |
---|---|---|
committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-11-26 20:48:45 +0000 |
commit | 1998cf5d32a19aaffe8652545802744d9133022d (patch) | |
tree | d893f35c7534f4a9a3b3619ecf3331ed946d2c33 /include/gtest/gtest.h | |
parent | 957ed9fb5210a8e0e51f713387961d2538921aed (diff) | |
download | googletest-1998cf5d32a19aaffe8652545802744d9133022d.tar.gz googletest-1998cf5d32a19aaffe8652545802744d9133022d.tar.bz2 googletest-1998cf5d32a19aaffe8652545802744d9133022d.zip |
Allow Google Mock to initialize Google Test
Diffstat (limited to 'include/gtest/gtest.h')
-rw-r--r-- | include/gtest/gtest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gtest/gtest.h b/include/gtest/gtest.h index 38fcd7d8..ebd3123b 100644 --- a/include/gtest/gtest.h +++ b/include/gtest/gtest.h @@ -554,13 +554,13 @@ inline Environment* AddGlobalTestEnvironment(Environment* env) { // // No value is returned. Instead, the Google Test flag variables are // updated. +// +// Calling the function for the second time has no user-visible effect. void InitGoogleTest(int* argc, char** argv); // This overloaded version can be used in Windows programs compiled in // UNICODE mode. -#ifdef GTEST_OS_WINDOWS void InitGoogleTest(int* argc, wchar_t** argv); -#endif // GTEST_OS_WINDOWS namespace internal { |