From 425d256321f590e4ca86e3294055e9fad135f9b2 Mon Sep 17 00:00:00 2001 From: mmentovai Date: Wed, 30 Aug 2006 20:05:05 +0000 Subject: Make build system less annoying (#8) r=bryner - Place objects in the appropriate directories, instead of filling up the root directory. - Remove namespace macros, which made maintenance troublesome and which created a dependency on config.h in public headers - Skip useless Fortran checks at configure time git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@8 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/config.h.in | 15 --------------- src/processor/source_line_resolver.cc | 10 +++++----- src/processor/source_line_resolver.h | 6 +++--- src/processor/source_line_resolver_unittest.cc | 4 ++-- 4 files changed, 10 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/config.h.in b/src/config.h.in index c3b8d399..6b4c3e48 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -1,8 +1,5 @@ /* src/config.h.in. Generated from configure.ac by autoheader. */ -/* Namespace for Google classes */ -#undef GOOGLE_NAMESPACE - /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -12,9 +9,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* define if the compiler implements namespaces */ -#undef HAVE_NAMESPACES - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -57,14 +51,5 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* the namespace where STL code like vector<> is defined */ -#undef STL_NAMESPACE - /* Version number of package */ #undef VERSION - -/* Stops putting the code inside the Google namespace */ -#undef _END_GOOGLE_NAMESPACE_ - -/* Puts following code inside the Google namespace */ -#undef _START_GOOGLE_NAMESPACE_ 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 #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()(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 #include -_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 #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)) { \ -- cgit v1.2.1