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
diff --git a/src/config.h.in b/src/config.h.in
index c3b8d39..6b4c3e4 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 <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -12,9 +9,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* define if the compiler implements namespaces */
-#undef HAVE_NAMESPACES
-
/* Define to 1 if you have the <stdint.h> 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 a6e87e7..a99dc41 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 @@
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 4432587..97bfa1d 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 @@
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 99f499d..8bfe662 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)) { \
