From ce94170eaebf33e8aa114d5323903daa9a329ea2 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 9 Dec 2016 09:47:03 +0200
Subject: [PATCH] Rename maxscale/cpp.hh to maxscale/cppdefs.hh

Just like every c-header must include maxscale/cdefs.h as the first
file, every C++-header must include maxscale/cppdefs.hh as its first
header.
---
 include/maxscale/{cpp.hh => cppdefs.hh}                       | 4 ++--
 include/maxscale/filter.hh                                    | 3 +--
 include/maxscale/spinlock.hh                                  | 3 +--
 server/modules/filter/cache/cache.hh                          | 3 +--
 server/modules/filter/cache/cache_storage_api.hh              | 2 +-
 server/modules/filter/cache/cachefilter.cc                    | 1 -
 server/modules/filter/cache/cachefilter.hh                    | 2 +-
 server/modules/filter/cache/cachefiltersession.hh             | 2 +-
 server/modules/filter/cache/cachemt.hh                        | 2 +-
 server/modules/filter/cache/cachept.cc                        | 1 -
 server/modules/filter/cache/cachept.hh                        | 2 +-
 server/modules/filter/cache/cachesimple.hh                    | 2 +-
 server/modules/filter/cache/cachest.cc                        | 1 -
 server/modules/filter/cache/cachest.hh                        | 2 +-
 server/modules/filter/cache/lrustorage.hh                     | 2 +-
 server/modules/filter/cache/lrustoragemt.hh                   | 2 +-
 server/modules/filter/cache/lrustoragest.cc                   | 1 -
 server/modules/filter/cache/lrustoragest.hh                   | 2 +-
 server/modules/filter/cache/storage.hh                        | 3 +--
 .../filter/cache/storage/storage_inmemory/inmemorystorage.hh  | 2 +-
 .../cache/storage/storage_inmemory/inmemorystoragemt.hh       | 2 +-
 .../cache/storage/storage_inmemory/inmemorystoragest.hh       | 2 +-
 .../filter/cache/storage/storage_rocksdb/rocksdbinternals.hh  | 2 +-
 .../filter/cache/storage/storage_rocksdb/rocksdbstorage.hh    | 2 +-
 server/modules/filter/cache/storagefactory.hh                 | 2 +-
 server/modules/filter/cache/storagereal.hh                    | 2 +-
 26 files changed, 23 insertions(+), 31 deletions(-)
 rename include/maxscale/{cpp.hh => cppdefs.hh} (95%)

diff --git a/include/maxscale/cpp.hh b/include/maxscale/cppdefs.hh
similarity index 95%
rename from include/maxscale/cpp.hh
rename to include/maxscale/cppdefs.hh
index 47348b798..f772df99f 100644
--- a/include/maxscale/cpp.hh
+++ b/include/maxscale/cppdefs.hh
@@ -13,9 +13,9 @@
  */
 
 /**
- * @file cpp.hh
+ * @file cppdefs.hh
  *
- * Common stuff for C++ code.
+ * This file is to be included first by all C++ headers.
  */
 
 #if !defined(__cplusplus)
diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh
index 5c2e935cb..019a578c5 100644
--- a/include/maxscale/filter.hh
+++ b/include/maxscale/filter.hh
@@ -12,9 +12,8 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/filter.h>
-#include <maxscale/cpp.hh>
 
 namespace maxscale
 {
diff --git a/include/maxscale/spinlock.hh b/include/maxscale/spinlock.hh
index 102b76cf4..8c5272571 100644
--- a/include/maxscale/spinlock.hh
+++ b/include/maxscale/spinlock.hh
@@ -12,9 +12,8 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/spinlock.h>
-#include <maxscale/cpp.hh>
 
 namespace maxscale
 {
diff --git a/server/modules/filter/cache/cache.hh b/server/modules/filter/cache/cache.hh
index db3b91dcb..bf26ea237 100644
--- a/server/modules/filter/cache/cache.hh
+++ b/server/modules/filter/cache/cache.hh
@@ -12,13 +12,12 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <tr1/functional>
 #include <tr1/memory>
 #include <string>
 #include <maxscale/buffer.h>
 #include <maxscale/session.h>
-#include <maxscale/cpp.hh>
 #include "cachefilter.h"
 #include "cache_storage_api.h"
 
diff --git a/server/modules/filter/cache/cache_storage_api.hh b/server/modules/filter/cache/cache_storage_api.hh
index ad0c1a910..51c8b2773 100644
--- a/server/modules/filter/cache/cache_storage_api.hh
+++ b/server/modules/filter/cache/cache_storage_api.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <functional>
 #include <string>
 #include <tr1/functional>
diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc
index a40e78523..6929b3487 100644
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@@ -16,7 +16,6 @@
 #include <maxscale/alloc.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/modulecmd.h>
-#include <maxscale/cpp.hh>
 #include "cachemt.hh"
 #include "cachept.hh"
 
diff --git a/server/modules/filter/cache/cachefilter.hh b/server/modules/filter/cache/cachefilter.hh
index 6f13ab56a..03356537a 100644
--- a/server/modules/filter/cache/cachefilter.hh
+++ b/server/modules/filter/cache/cachefilter.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/filter.hh>
 #include "cachefilter.h"
 #include "cachefiltersession.hh"
diff --git a/server/modules/filter/cache/cachefiltersession.hh b/server/modules/filter/cache/cachefiltersession.hh
index fff444c0c..0c54bd429 100644
--- a/server/modules/filter/cache/cachefiltersession.hh
+++ b/server/modules/filter/cache/cachefiltersession.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/buffer.h>
 #include <maxscale/filter.hh>
 #include "cache.hh"
diff --git a/server/modules/filter/cache/cachemt.hh b/server/modules/filter/cache/cachemt.hh
index 6d31246b7..cf1afd31f 100644
--- a/server/modules/filter/cache/cachemt.hh
+++ b/server/modules/filter/cache/cachemt.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/spinlock.hh>
 #include "cachesimple.hh"
 
diff --git a/server/modules/filter/cache/cachept.cc b/server/modules/filter/cache/cachept.cc
index aa37a8a7b..5e34a681e 100644
--- a/server/modules/filter/cache/cachept.cc
+++ b/server/modules/filter/cache/cachept.cc
@@ -15,7 +15,6 @@
 #include "cachept.hh"
 #include <maxscale/atomic.h>
 #include <maxscale/platform.h>
-#include <maxscale/cpp.hh>
 #include "cachest.hh"
 #include "storagefactory.hh"
 
diff --git a/server/modules/filter/cache/cachept.hh b/server/modules/filter/cache/cachept.hh
index 24a6feeac..19aab201e 100644
--- a/server/modules/filter/cache/cachept.hh
+++ b/server/modules/filter/cache/cachept.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <tr1/memory>
 #include <vector>
 #include "cache.hh"
diff --git a/server/modules/filter/cache/cachesimple.hh b/server/modules/filter/cache/cachesimple.hh
index 24ecf9386..cee5834df 100644
--- a/server/modules/filter/cache/cachesimple.hh
+++ b/server/modules/filter/cache/cachesimple.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <tr1/unordered_map>
 #include <maxscale/hashtable.h>
 #include "cache.hh"
diff --git a/server/modules/filter/cache/cachest.cc b/server/modules/filter/cache/cachest.cc
index d810a55ae..f42048b14 100644
--- a/server/modules/filter/cache/cachest.cc
+++ b/server/modules/filter/cache/cachest.cc
@@ -13,7 +13,6 @@
 
 #define MXS_MODULE_NAME "cache"
 #include "cachest.hh"
-#include <maxscale/cpp.hh>
 #include "storage.hh"
 #include "storagefactory.hh"
 
diff --git a/server/modules/filter/cache/cachest.hh b/server/modules/filter/cache/cachest.hh
index 3e0c19a89..d07b74467 100644
--- a/server/modules/filter/cache/cachest.hh
+++ b/server/modules/filter/cache/cachest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include "cachesimple.hh"
 
 class CacheST : public CacheSimple
diff --git a/server/modules/filter/cache/lrustorage.hh b/server/modules/filter/cache/lrustorage.hh
index a1e19fb9d..1c72f49c4 100644
--- a/server/modules/filter/cache/lrustorage.hh
+++ b/server/modules/filter/cache/lrustorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <tr1/unordered_map>
 #include "cachefilter.h"
 #include "cache_storage_api.hh"
diff --git a/server/modules/filter/cache/lrustoragemt.hh b/server/modules/filter/cache/lrustoragemt.hh
index cc21345b5..d77ad54d6 100644
--- a/server/modules/filter/cache/lrustoragemt.hh
+++ b/server/modules/filter/cache/lrustoragemt.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/spinlock.hh>
 #include "lrustorage.hh"
 
diff --git a/server/modules/filter/cache/lrustoragest.cc b/server/modules/filter/cache/lrustoragest.cc
index f5c11c54b..7e185e222 100644
--- a/server/modules/filter/cache/lrustoragest.cc
+++ b/server/modules/filter/cache/lrustoragest.cc
@@ -13,7 +13,6 @@
 
 #define MXS_MODULE_NAME "cache"
 #include "lrustoragest.hh"
-#include <maxscale/cpp.hh>
 
 LRUStorageST::LRUStorageST(Storage* pstorage, size_t max_count, size_t max_size)
     : LRUStorage(pstorage, max_count, max_size)
diff --git a/server/modules/filter/cache/lrustoragest.hh b/server/modules/filter/cache/lrustoragest.hh
index 2e250d9f5..fd422052c 100644
--- a/server/modules/filter/cache/lrustoragest.hh
+++ b/server/modules/filter/cache/lrustoragest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include "lrustorage.hh"
 
 class LRUStorageST : public LRUStorage
diff --git a/server/modules/filter/cache/storage.hh b/server/modules/filter/cache/storage.hh
index 2672407c3..4ce8482b6 100644
--- a/server/modules/filter/cache/storage.hh
+++ b/server/modules/filter/cache/storage.hh
@@ -12,8 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
-#include <maxscale/cpp.hh>
+#include <maxscale/cppdefs.hh>
 #include "cache_storage_api.h"
 
 class Storage
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
index d3823cd23..60a397777 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
index 32cdbe7b2..af68aa87e 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragemt.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <maxscale/spinlock.hh>
 #include "inmemorystorage.hh"
 
diff --git a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
index fd0fe13aa..62e84f49e 100644
--- a/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
+++ b/server/modules/filter/cache/storage/storage_inmemory/inmemorystoragest.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include "inmemorystorage.hh"
 
 class InMemoryStorageST : public InMemoryStorage
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh
index d9fe4f5d1..c85c66a89 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbinternals.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <rocksdb/env.h>
 #include <rocksdb/version.h>
 #include <rocksdb/slice.h>
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh
index eec3bd762..618a89d83 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include <memory>
 #include <string>
 #include <rocksdb/utilities/db_ttl.h>
diff --git a/server/modules/filter/cache/storagefactory.hh b/server/modules/filter/cache/storagefactory.hh
index 61326a4a2..9c99db602 100644
--- a/server/modules/filter/cache/storagefactory.hh
+++ b/server/modules/filter/cache/storagefactory.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include "cache_storage_api.h"
 
 class Storage;
diff --git a/server/modules/filter/cache/storagereal.hh b/server/modules/filter/cache/storagereal.hh
index f7322a501..408ced872 100644
--- a/server/modules/filter/cache/storagereal.hh
+++ b/server/modules/filter/cache/storagereal.hh
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#include <maxscale/cdefs.h>
+#include <maxscale/cppdefs.hh>
 #include "storage.hh"
 
 class StorageReal : public Storage