Remove _START_GOOGLE_NAMESPACE_

src/base/arena-inl.h

@@ -66,9 +66,8 @@
 #include <stddef.h>
 #include <new>
 #include <memory>
-_START_GOOGLE_NAMESPACE_
-
 
+namespace ctemplate {
 
 // T is the type we want to allocate, and C is the type of the arena.
 // ArenaAllocator has the thread-safety characteristics of C.
@@ -161,7 +160,7 @@ inline void* operator new[](size_t size,
   return arena->Alloc(size);
 }
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // Ordinarily in C++, one allocates all instances of a class from an
 // arena.  If that's what you want to do, you don't need Gladiator.

src/base/arena.cc

@@ -70,7 +70,7 @@ static void* aligned_malloc(size_t size, size_t alignment) {
 // The value here doesn't matter until page_aligned_ is supported.
 static const int kPageSize = 8192;   // should be getpagesize()
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // We used to only keep track of how much space has been allocated in
 // debug mode. Now we track this for optimized builds, as well. If you

src/base/arena.h

@@ -279,7 +279,7 @@
 #include "base/macros.h"  // for uint32
 #include "base/util.h"    // for CHECK, etc
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // Annoying stuff for windows -- make sure clients (in this case
 // unittests) can import the class definitions and variables.

src/base/fileutil.h

@@ -44,7 +44,7 @@
 #endif
 #include <string>
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 class FileStat {
  public:

src/base/manual_constructor.h

@@ -45,7 +45,8 @@
 #define UTIL_GTL_MANUAL_CONSTRUCTOR_H_
 
 #include <config.h>
-_START_GOOGLE_NAMESPACE_
+
+namespace ctemplate {
 
 namespace util {
 namespace gtl {

src/base/mutex.h

@@ -158,7 +158,7 @@
 #include <assert.h>
 #include <stdlib.h>      // for abort()
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 namespace base {
 // This is used for the single-arg constructor

src/base/small_map.h

@@ -52,7 +52,8 @@
 #include <assert.h>
 #include <utility>   // for make_pair()
 #include "base/manual_constructor.h"
-_START_GOOGLE_NAMESPACE_
+
+namespace ctemplate {
 
 template <bool> struct CompileAssert { };
 #define COMPILE_ASSERT(expr, msg) \

src/indented_writer.h

@@ -36,7 +36,7 @@
 #include <config.h>
 #include <string>
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using std::string;
 

src/per_expand_data.cc

@@ -38,7 +38,7 @@
 #include <ctemplate/per_expand_data.h>
 #include <ctemplate/template_annotator.h>
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using std::string;
 

src/template.cc

@@ -114,7 +114,7 @@ using HASH_NAMESPACE::unordered_map;
 using HASH_NAMESPACE::hash_map;
 #endif
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using HTMLPARSER_NAMESPACE::HtmlParser;
 

src/template_annotator.cc

@@ -49,7 +49,7 @@
   (emitter)->Emit(value);                               \
   (emitter)->Emit("}}", 2);
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using std::string;
 

src/template_cache.cc

@@ -78,7 +78,7 @@ static int kVerbosity = 0;   // you can change this by hand to get vlogs
 #define PLOG(level)   std::cerr << #level ": [" << strerror(errno) << "] "
 #define VLOG(level)  if (kVerbosity >= level)  std::cerr << "V" #level ": "
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // ----------------------------------------------------------------------
 // TemplateCache::RefcountedTemplate

src/template_dictionary.cc

@@ -60,7 +60,7 @@ using std::map;
 using std::pair;
 using std::make_pair;
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // Guards the initialization of the global dictionary.
 static GoogleOnceType g_once = GOOGLE_ONCE_INIT;

src/template_modifiers.cc

@@ -82,7 +82,7 @@ bool HasInsecureProtocol(const char* in, int inlen) {
 }
 }  // namespace URL
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using HTMLPARSER_NAMESPACE::HtmlParser;
 

src/template_modifiers_internal.h

@@ -65,12 +65,11 @@
 using std::string;
 using std::vector;
 
-
 namespace HTMLPARSER_NAMESPACE {
 class HtmlParser;
 }
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 class TemplateModifier;
 

src/template_namelist.cc

@@ -54,7 +54,7 @@ using std::vector;
 
 #define LOG(level)  std::cerr << #level << ": "
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 TemplateNamelist::NameListType *TemplateNamelist::namelist_ = NULL;
 TemplateNamelist::MissingListType *TemplateNamelist::missing_list_ = NULL;

src/template_pathops.cc

@@ -48,7 +48,7 @@
 # endif
 #endif
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using std::string;
 

src/template_string.cc

@@ -50,7 +50,7 @@ using HASH_NAMESPACE::unordered_set;
 using HASH_NAMESPACE::hash_set;
 #endif
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // Based on public domain MurmurHashUnaligned2, by Austin Appleby.
 // http://murmurhash.googlepages.com/

src/tests/template_test_util.cc

@@ -82,7 +82,7 @@ using std::vector;
   }                                                             \
 } while (0)
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // Deletes all files named *template* in dir, and sets up dir as the
 // place where StringToTemplate writes.

src/tests/template_test_util.h

@@ -52,7 +52,7 @@
 #include <ctemplate/template_namelist.h>
 #include <ctemplate/template_string.h>  // for TemplateString, TemplateId
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 using std::string;
 

src/windows/port.cc

@@ -68,7 +68,7 @@ int snprintf(char *str, size_t size, const char *format, ...) {
 using std::string;
 using std::vector;
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 
 // defined (for unix) in template_test_utils.cc
 string TmpFile(const char* basename) {

src/windows/port.h

@@ -122,7 +122,7 @@ extern int CTEMPLATE_DLL_DECL safe_vsnprintf(char *str, size_t size,
 #include <string>
 #include <vector>
 
-_START_GOOGLE_NAMESPACE_
+namespace ctemplate {
 extern CTEMPLATE_DLL_DECL std::string TmpFile(const char* basename);
 void CTEMPLATE_DLL_DECL CreateOrCleanTestDir(const std::string& dirname);
 }