diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-01-19 16:46:57 -0800 |
|---|---|---|
| committer |  Adam Cozzette <acozzette@acozzette0.svl.corp.google.com> | 2018-01-26 16:17:14 -0800 |
| commit | 39a789e657a52e835c281233b63cc2a6bb387fd4 (patch) | |
| tree | 18954017db14eb09c290ddbe0425a212b14d2b28 /src/google/protobuf/testing | |
| parent | c236896ec5a7f9c0b021f14be61ee2e0a2c7a91b (diff) | |
Removed using statements from common.h
These statements pulled a bunch of symbols from the std namespace into
the global namespace. This commit removes all of them except for
std::string, which is a bit trickier to remove.
Diffstat (limited to 'src/google/protobuf/testing')
| -rw-r--r-- | src/google/protobuf/testing/googletest.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/testing/googletest.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/testing/googletest.cc b/src/google/protobuf/testing/googletest.cc index b81d3994..8c89e5af 100644 --- a/src/google/protobuf/testing/googletest.cc +++ b/src/google/protobuf/testing/googletest.cc @@ -263,7 +263,7 @@ ScopedMemoryLog::~ScopedMemoryLog() { active_log_ = NULL; } -const vector<string>& ScopedMemoryLog::GetMessages(LogLevel level) { +const std::vector<string>& ScopedMemoryLog::GetMessages(LogLevel level) { GOOGLE_CHECK(level == ERROR || level == WARNING); return messages_[level]; diff --git a/src/google/protobuf/testing/googletest.h b/src/google/protobuf/testing/googletest.h index 2db3bfee..81637486 100644 --- a/src/google/protobuf/testing/googletest.h +++ b/src/google/protobuf/testing/googletest.h @@ -83,10 +83,10 @@ class ScopedMemoryLog { virtual ~ScopedMemoryLog(); // Fetches all messages with the given severity level. - const vector<string>& GetMessages(LogLevel error); + const std::vector<string>& GetMessages(LogLevel error); private: - std::map<LogLevel, vector<string> > messages_; + std::map<LogLevel, std::vector<string> > messages_; LogHandler* old_handler_; static void HandleLog(LogLevel level, const char* filename, int line, |