mirror/ctemplate
1
0
Fork 0
mirror of https://github.com/OlafvdSpek/ctemplate.git synced 2025-10-05 19:16:54 +08:00
Code Issues Releases Wiki Activity

Remove GOOGLE_NAMESPACE

Browse Source
This commit is contained in:
Olaf van der Spek 2017-01-30 11:43:52 +01:00
parent 65f080f2b4
commit 9625c49465
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -22,8 +22,6 @@ AC_CONFIG_HEADERS([src/config.h])
# Checks for programs.
AC_PROG_CXX
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CPP
AM_PROG_AR
AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc
@ -43,8 +41,6 @@ LT_INIT([disable-fast-install])
AC_SUBST(LIBTOOL_DEPS)
AC_SUBST(SO_VERSION)
AC_PROG_LN_S
AX_C___ATTRIBUTE__
# Check whether some low-level functions/files are available
@ -83,11 +79,6 @@ AC_RWLOCK
# unclear, so it's best just to check.
AC_INTERLOCKED_EXCHANGE_NONVOLATILE
# Find out what namespace 'normal' STL code lives in, and also what namespace
# the user wants our classes to be defined in
AC_CXX_STL_NAMESPACE
AC_DEFINE_GOOGLE_NAMESPACE(ctemplate)
# Figures out where hash_map and hash_set live, and what namespace they use
AC_CXX_STL_HASH

2
src/ctemplate/template.h.in
View File

@ -51,7 +51,7 @@
#include <ctemplate/template_namelist.h>
#include <ctemplate/per_expand_data.h>
#else
@ac_google_start_namespace@
namespace ctemplate {
class TemplateDictionaryInterface;
class PerExpandData;
}

2
src/ctemplate/template_cache.h.in
View File

@ -42,7 +42,7 @@
#include <ctemplate/template_enums.h> // for Strip
#include <ctemplate/template_string.h>
#include <ctemplate/per_expand_data.h>
@ac_google_start_namespace@
namespace ctemplate {
class FileStat;
}
class Mutex;

6
src/ctemplate/template_dictionary.h.in
View File

@ -62,14 +62,12 @@
@ac_windows_dllexport_defines@
@ac_google_start_namespace@
namespace ctemplate {
template <class T, class C> class ArenaAllocator;
class UnsafeArena;
template<typename A, int B, typename C, typename D> class small_map;
template<typename NormalMap> class small_map_default_init; // in small_map.h
}
namespace ctemplate {
class @ac_windows_dllexport@ TemplateDictionary : public TemplateDictionaryInterface {