diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-24 20:43:09 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-24 20:43:09 +0000 |
| commit | a9335896d836684d03bb5a6ee13429f666b14110 (patch) | |
| tree | bffd331e4e50b3c299f8d5666dbe34d032ffd9d0 /include | |
| parent | 32bf248084e2a78081921dc336083df13319986d (diff) | |
| download | googletest-a9335896d836684d03bb5a6ee13429f666b14110.tar.gz | |
Inject GetArgvs() with a macro from custom/gtest-port.h.
git-svn-id: http://googletest.googlecode.com/svn/trunk@738 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/internal/gtest-internal.h | 3 | ||||
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index ee2dc4a..ebd1cf6 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -100,9 +100,6 @@ class ScopedTrace; // Implements scoped trace. class TestInfoImpl; // Opaque implementation of TestInfo class UnitTestImpl; // Opaque implementation of UnitTest -// How many times InitGoogleTest() has been called. -GTEST_API_ extern int g_init_gtest_count; - // The text used in failure messages to indicate the start of the // stack trace. GTEST_API_ extern const char kStackTraceMarker[]; diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 4438b05..30997f3 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -276,6 +276,7 @@ #include <sstream> // NOLINT #include <string> // NOLINT #include <utility> +#include <vector> // NOLINT #include "gtest/internal/gtest-port-arch.h" #include "gtest/internal/custom/gtest-port.h" @@ -785,7 +786,6 @@ using ::std::tuple_size; GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD) # define GTEST_HAS_DEATH_TEST 1 -# include <vector> // NOLINT #endif // We don't support MSVC 7.1 with exceptions disabled now. Therefore @@ -1421,14 +1421,15 @@ GTEST_API_ size_t GetFileSize(FILE* file); // Reads the entire content of a file as a string. GTEST_API_ std::string ReadEntireFile(FILE* file); +// All command line arguments. +GTEST_API_ const ::std::vector<testing::internal::string>& GetArgvs(); + #if GTEST_HAS_DEATH_TEST const ::std::vector<testing::internal::string>& GetInjectableArgvs(); void SetInjectableArgvs(const ::std::vector<testing::internal::string>* new_argvs); -// A copy of all command line arguments. Set by ParseGTestFlags(). -extern ::std::vector<testing::internal::string> g_argvs; #endif // GTEST_HAS_DEATH_TEST |