diff options
Diffstat (limited to 'src/processor')
-rw-r--r-- | src/processor/source_line_resolver.cc | 10 | ||||
-rw-r--r-- | src/processor/source_line_resolver.h | 6 | ||||
-rw-r--r-- | src/processor/source_line_resolver_unittest.cc | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/processor/source_line_resolver.cc b/src/processor/source_line_resolver.cc index a6e87e7b..a99dc41f 100644 --- a/src/processor/source_line_resolver.cc +++ b/src/processor/source_line_resolver.cc @@ -19,12 +19,12 @@ #include <utility> #include "source_line_resolver.h" -using STL_NAMESPACE::map; -using STL_NAMESPACE::vector; -using STL_NAMESPACE::make_pair; +using std::map; +using std::vector; +using std::make_pair; using __gnu_cxx::hash; -_START_GOOGLE_NAMESPACE_ +namespace google_airbag { void SourceLineResolver::SourceLineInfo::Reset() { function_name.clear(); @@ -272,4 +272,4 @@ size_t SourceLineResolver::HashString::operator()(const string &s) const { return hash<const char*>()(s.c_str()); } -_END_GOOGLE_NAMESPACE_ +} // namespace google_airbag diff --git a/src/processor/source_line_resolver.h b/src/processor/source_line_resolver.h index 44325872..97bfa1df 100644 --- a/src/processor/source_line_resolver.h +++ b/src/processor/source_line_resolver.h @@ -23,9 +23,9 @@ #include <string> #include <ext/hash_map> -_START_GOOGLE_NAMESPACE_ +namespace google_airbag { -using STL_NAMESPACE::string; +using std::string; using __gnu_cxx::hash_map; class SourceLineResolver { @@ -83,6 +83,6 @@ class SourceLineResolver { void operator=(const SourceLineResolver&); }; -_END_GOOGLE_NAMESPACE_ +} // namespace google_airbag #endif // _SOLURCE_LINE_RESOLVER_H__ diff --git a/src/processor/source_line_resolver_unittest.cc b/src/processor/source_line_resolver_unittest.cc index 99f499df..8bfe662c 100644 --- a/src/processor/source_line_resolver_unittest.cc +++ b/src/processor/source_line_resolver_unittest.cc @@ -16,8 +16,8 @@ #include <string> #include "source_line_resolver.h" -using STL_NAMESPACE::string; -using GOOGLE_NAMESPACE::SourceLineResolver; +using std::string; +using google_airbag::SourceLineResolver; #define ASSERT_TRUE(cond) \ if (!(cond)) { \ |