Remove STATWRITER_NAMESPACE namespacing

Prior to C++11 we had to jump through some hoops to allow multiple
(identical) declarations of the same template name. This is no longer
necessary, so simplify the code to remove these extra defines /
namespacing.

Change-Id: I6bd5e4cee97fafb327c1f357d629bbd28ffb96f5
Reviewed-on: http://review.couchbase.org/82694
Reviewed-by: Trond Norbye <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: daverigby

engines/ep/src/checkpoint.cc

@@ -26,9 +26,7 @@
 #include "ep_engine.h"
 #include "ep_time.h"
 #include "pre_link_document_context.h"
-#define STATWRITER_NAMESPACE checkpoint
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 #include "vbucket.h"
 
 const std::string CheckpointManager::pCursorName("persistence");

engines/ep/src/configuration.cc

@@ -25,10 +25,7 @@
 #ifdef AUTOCONF_BUILD
 #include "generated_configuration.cc"
 #endif
-
-#define STATWRITER_NAMESPACE config
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 
 // Used to get a name from a type to use in logging
 template <typename T>

engines/ep/src/couch-kvstore/couch-kvstore.cc

@@ -47,9 +47,7 @@
 #include "couch-kvstore/couch-kvstore.h"
 #include "ep_types.h"
 #include "kvstore_config.h"
-#define STATWRITER_NAMESPACE couchstore_engine
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 #include "vbucket.h"
 #include "vbucket_bgfetch_item.h"
 

engines/ep/src/ep_engine.cc

@@ -36,9 +36,7 @@
 #include "memory_tracker.h"
 #include "replicationthrottle.h"
 #include "stats-info.h"
-#define STATWRITER_NAMESPACE core_engine
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 #include "string_utils.h"
 #include "vb_count_visitor.h"
 #include "warmup.h"

engines/ep/src/failover-table.cc

@@ -21,9 +21,7 @@
 
 #include "atomic.h"
 #include "failover-table.h"
-#define STATWRITER_NAMESPACE failovers
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 
 FailoverTable::FailoverTable(size_t capacity)
     : max_entries(capacity), erroneousEntriesErased(0), provider(true) {

engines/ep/src/forest-kvstore/forest-kvstore.cc

@@ -25,10 +25,7 @@
 #include <vbucket.h>
 #include <JSON_checker.h>
 #include <locks.h>
-
-#define STATWRITER_NAMESPACE forestdb_engine
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 
 std::mutex ForestKVStore::initLock;
 int ForestKVStore::numGlobalFiles = 0;

engines/ep/src/statwriter.h

@@ -15,24 +15,21 @@
  *   limitations under the License.
  */
 
-#ifndef SRC_STATWRITER_H_
-#define SRC_STATWRITER_H_ 1
+#pragma once
 
 #include "config.h"
 
+#include "objectregistry.h"
 
-#include <atomic>
+#include <memcached/engine_common.h>
 #include <platform/histogram.h>
 #include <platform/sized_buffer.h>
-#include "objectregistry.h"
 
+#include <atomic>
 #include <cstring>
-#include <memcached/engine_common.h>
 
 class EventuallyPersistentEngine;
 
-namespace STATWRITER_NAMESPACE {
-
 inline void add_casted_stat(const char *k, const char *v,
                             ADD_STAT add_stat, const void *cookie) {
     EventuallyPersistentEngine *e = ObjectRegistry::onSwitchThread(NULL, true);
@@ -113,9 +110,3 @@ void add_prefixed_stat(P prefix, const char *nm, Histogram<T> &val,
 
     add_casted_stat(name.str().c_str(), val, add_stat, cookie);
 }
-
-}
-
-using namespace STATWRITER_NAMESPACE;
-
-#endif  // SRC_STATWRITER_H_

engines/ep/src/vbucket.cc

@@ -33,10 +33,7 @@
 #include "flusher.h"
 #include "pre_link_document_context.h"
 #include "vbucketdeletiontask.h"
-
-#define STATWRITER_NAMESPACE vbucket
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 #include "stored_value_factories.h"
 
 #include "vbucket.h"

engines/ep/src/warmup.cc

@@ -23,9 +23,7 @@
 #include "ep_vb.h"
 #include "failover-table.h"
 #include "mutation_log.h"
-#define STATWRITER_NAMESPACE warmup
 #include "statwriter.h"
-#undef STATWRITER_NAMESPACE
 #include "vbucket_bgfetch_item.h"
 
 #include <platform/make_unique.h>