commit 0c47567b9c99d2e2e431b84ff0363d1a5a6648d0
author Sai Boorlagadda <sboorlagadda@pivotal.io> Fri Oct 26 10:43:43 2018 -0700
committer Matthew Reddington <mreddington@gmail.com> Fri Oct 26 10:43:43 2018 -0700
tree e1a7cb16c34daa50dfb5270ea60a16894f280d4c
parent 4d7309f55b24c8e5e41131dadf6fdf644666e5bf

GEODE-5942: prefix variables in PersistenceManager

  PAGE_SIZE causes conflicts with system library header files.
  So adding a PM prefix to all variables in PersistenceManager.

Signed-off-by: Matthew Reddington <mreddington@gmail.com>

cppcache/include/geode/PersistenceManager.hpp

diff --git a/cppcache/include/geode/PersistenceManager.hpp b/cppcache/include/geode/PersistenceManager.hpp
index 9cd591a..b421d64 100644
--- a/cppcache/include/geode/PersistenceManager.hpp
+++ b/cppcache/include/geode/PersistenceManager.hpp
@@ -51,9 +51,9 @@
  */
 class APACHE_GEODE_EXPORT PersistenceManager {
  public:
-  static constexpr char const* MAX_PAGE_COUNT = "MaxPageCount";
-  static constexpr char const* PAGE_SIZE = "PageSize";
-  static constexpr char const* PERSISTENCE_DIR = "PersistenceDirectory";
+  static constexpr char const* PM_MAX_PAGE_COUNT = "MaxPageCount";
+  static constexpr char const* PM_PAGE_SIZE = "PageSize";
+  static constexpr char const* PM_PERSISTENCE_DIR = "PersistenceDirectory";
 
   /**
    * Returns the current persistence manager.

cppcache/integration-test/testOverflowPutGetSqLite.cpp

diff --git a/cppcache/integration-test/testOverflowPutGetSqLite.cpp b/cppcache/integration-test/testOverflowPutGetSqLite.cpp
index 4afa8c3..71a9076 100644
--- a/cppcache/integration-test/testOverflowPutGetSqLite.cpp
+++ b/cppcache/integration-test/testOverflowPutGetSqLite.cpp
@@ -337,9 +337,9 @@
                          int maxPageCount = 1073741823, int pageSize = 65536,
                          std::string pDir = sqlite_dir) {
   sqliteProperties = Properties::create();
-  sqliteProperties->insert(PersistenceManager::MAX_PAGE_COUNT, maxPageCount);
-  sqliteProperties->insert(PersistenceManager::PAGE_SIZE, pageSize);
-  sqliteProperties->insert(PersistenceManager::PERSISTENCE_DIR, pDir.c_str());
+  sqliteProperties->insert(PersistenceManager::PM_MAX_PAGE_COUNT, maxPageCount);
+  sqliteProperties->insert(PersistenceManager::PM_PAGE_SIZE, pageSize);
+  sqliteProperties->insert(PersistenceManager::PM_PERSISTENCE_DIR, pDir.c_str());
   ASSERT(sqliteProperties != nullptr,
          "Expected sqlite properties to be NON-nullptr");
 }

cppcache/src/PersistenceManager.cpp

diff --git a/cppcache/src/PersistenceManager.cpp b/cppcache/src/PersistenceManager.cpp
index c664226..b9cb880 100644
--- a/cppcache/src/PersistenceManager.cpp
+++ b/cppcache/src/PersistenceManager.cpp
@@ -21,9 +21,9 @@
 namespace geode {
 namespace client {
 
-constexpr char const* PersistenceManager::MAX_PAGE_COUNT;
-constexpr char const* PersistenceManager::PAGE_SIZE;
-constexpr char const* PersistenceManager::PERSISTENCE_DIR;
+constexpr char const* PersistenceManager::PM_MAX_PAGE_COUNT;
+constexpr char const* PersistenceManager::PM_PAGE_SIZE;
+constexpr char const* PersistenceManager::PM_PERSISTENCE_DIR;
 
 }  // namespace client
 }  // namespace geode

sqliteimpl/SqLiteImpl.cpp

diff --git a/sqliteimpl/SqLiteImpl.cpp b/sqliteimpl/SqLiteImpl.cpp
index 043398a..d92ee2a 100644
--- a/sqliteimpl/SqLiteImpl.cpp
+++ b/sqliteimpl/SqLiteImpl.cpp
@@ -43,9 +43,9 @@
   m_persistanceDir = g_default_persistence_directory;
   std::string regionName = region->getName();
   if (diskProperties != nullptr) {
-    auto maxPageCountPtr = diskProperties->find(MAX_PAGE_COUNT);
-    auto pageSizePtr = diskProperties->find(PAGE_SIZE);
-    auto persDir = diskProperties->find(PERSISTENCE_DIR);
+    auto maxPageCountPtr = diskProperties->find(PM_MAX_PAGE_COUNT);
+    auto pageSizePtr = diskProperties->find(PM_PAGE_SIZE);
+    auto persDir = diskProperties->find(PM_PERSISTENCE_DIR);
 
     if (maxPageCountPtr != nullptr) {
       maxPageCount = atoi(maxPageCountPtr->value().c_str());