aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/testing
diff options
context:
space:
mode:
authorGravatar tanderson-google <thomasanderson@google.com>2017-07-09 20:31:50 -0700
committerGravatar Adam Cozzette <acozzette@gmail.com>2017-07-09 20:31:50 -0700
commit126082c371d2320255ac8ff7d68bef25a919572d (patch)
tree72bf0b5b5d8ee5249d2128bc91936733eb42294b /src/google/protobuf/testing
parentb9c4daadf7e27c0a533f86d567a89b691aa0ad9f (diff)
Add std:: namespace prefix to set and map (#3332)
* Remove using std::{set,map}
Diffstat (limited to 'src/google/protobuf/testing')
-rw-r--r--src/google/protobuf/testing/googletest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/testing/googletest.h b/src/google/protobuf/testing/googletest.h
index c0d99e69..bf8bf282 100644
--- a/src/google/protobuf/testing/googletest.h
+++ b/src/google/protobuf/testing/googletest.h
@@ -85,7 +85,7 @@ class ScopedMemoryLog {
const vector<string>& GetMessages(LogLevel error);
private:
- map<LogLevel, vector<string> > messages_;
+ std::map<LogLevel, vector<string> > messages_;
LogHandler* old_handler_;
static void HandleLog(LogLevel level, const char* filename, int line,