You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/01/25 04:01:50 UTC
[geode-native] branch develop updated: GEODE-4356: Moved Cacheable
typedef to Serializable.hpp (#193)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 6081f81 GEODE-4356: Moved Cacheable typedef to Serializable.hpp (#193)
6081f81 is described below
commit 6081f817103b6190fbda7499ea5789ecf328afee
Author: mhansonp <mh...@pivotal.io>
AuthorDate: Wed Jan 24 20:01:48 2018 -0800
GEODE-4356: Moved Cacheable typedef to Serializable.hpp (#193)
---
cppcache/include/geode/CacheLoader.hpp | 2 +-
cppcache/include/geode/Cacheable.hpp | 41 -------------------------
cppcache/include/geode/CacheableBuiltins.hpp | 2 +-
cppcache/include/geode/CacheableKey.hpp | 2 +-
cppcache/include/geode/CacheableObjectArray.hpp | 2 +-
cppcache/include/geode/CacheableUndefined.hpp | 2 +-
cppcache/include/geode/CqEvent.hpp | 2 +-
cppcache/include/geode/EntryEvent.hpp | 2 +-
cppcache/include/geode/PartitionResolver.hpp | 2 +-
cppcache/include/geode/PersistenceManager.hpp | 2 +-
cppcache/include/geode/Properties.hpp | 2 +-
cppcache/include/geode/Region.hpp | 2 +-
cppcache/include/geode/Serializable.hpp | 2 ++
cppcache/include/geode/WritablePdxInstance.hpp | 2 +-
cppcache/src/AdminRegion.hpp | 2 +-
cppcache/src/CacheableObjectPartList.hpp | 2 +-
cppcache/src/CacheableToken.hpp | 2 +-
cppcache/src/ClientMetadataService.hpp | 2 +-
cppcache/src/CqEventImpl.hpp | 2 +-
cppcache/src/Delta.cpp | 2 +-
cppcache/src/EventId.hpp | 2 +-
cppcache/src/FarSideEntryOp.hpp | 2 +-
cppcache/src/LocalRegion.hpp | 2 +-
cppcache/src/MapEntry.hpp | 2 +-
cppcache/src/TcrMessage.hpp | 2 +-
cppcache/src/TransactionalOperation.hpp | 2 +-
cppcache/src/VersionTag.hpp | 2 +-
27 files changed, 27 insertions(+), 66 deletions(-)
diff --git a/cppcache/include/geode/CacheLoader.hpp b/cppcache/include/geode/CacheLoader.hpp
index cb8759d..3ea8e2d 100644
--- a/cppcache/include/geode/CacheLoader.hpp
+++ b/cppcache/include/geode/CacheLoader.hpp
@@ -26,7 +26,7 @@
#include "internal/geode_globals.hpp"
#include "CacheableKey.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/Cacheable.hpp b/cppcache/include/geode/Cacheable.hpp
deleted file mode 100644
index c465bb7..0000000
--- a/cppcache/include/geode/Cacheable.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#ifndef GEODE_CACHEABLE_H_
-#define GEODE_CACHEABLE_H_
-
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-
-#include "internal/geode_globals.hpp"
-#include "Serializable.hpp"
-#include "internal/functional.hpp"
-
-namespace apache {
-namespace geode {
-namespace client {
-
-typedef Serializable Cacheable;
-
-} // namespace client
-} // namespace geode
-} // namespace apache
-
-#endif // GEODE_CACHEABLE_H_
diff --git a/cppcache/include/geode/CacheableBuiltins.hpp b/cppcache/include/geode/CacheableBuiltins.hpp
index 3184377..beba9df 100644
--- a/cppcache/include/geode/CacheableBuiltins.hpp
+++ b/cppcache/include/geode/CacheableBuiltins.hpp
@@ -27,7 +27,7 @@
#include <cstring>
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "CacheableKey.hpp"
#include "Serializer.hpp"
#include "CacheableKeys.hpp"
diff --git a/cppcache/include/geode/CacheableKey.hpp b/cppcache/include/geode/CacheableKey.hpp
index 90dbd89..7f523bd 100644
--- a/cppcache/include/geode/CacheableKey.hpp
+++ b/cppcache/include/geode/CacheableKey.hpp
@@ -25,7 +25,7 @@
#include <unordered_set>
#include "internal/geode_globals.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "internal/functional.hpp"
/**
diff --git a/cppcache/include/geode/CacheableObjectArray.hpp b/cppcache/include/geode/CacheableObjectArray.hpp
index 170e295..0e318d2 100644
--- a/cppcache/include/geode/CacheableObjectArray.hpp
+++ b/cppcache/include/geode/CacheableObjectArray.hpp
@@ -24,7 +24,7 @@
#include <memory>
#include "internal/geode_globals.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
/** @file
*/
diff --git a/cppcache/include/geode/CacheableUndefined.hpp b/cppcache/include/geode/CacheableUndefined.hpp
index b4ad91e..ee17ade 100644
--- a/cppcache/include/geode/CacheableUndefined.hpp
+++ b/cppcache/include/geode/CacheableUndefined.hpp
@@ -23,7 +23,7 @@
#include <memory>
#include "internal/geode_globals.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
/** @file
*/
diff --git a/cppcache/include/geode/CqEvent.hpp b/cppcache/include/geode/CqEvent.hpp
index d8e6f68..677a312 100644
--- a/cppcache/include/geode/CqEvent.hpp
+++ b/cppcache/include/geode/CqEvent.hpp
@@ -23,7 +23,7 @@
#include "internal/geode_globals.hpp"
#include "Exception.hpp"
#include "CqOperation.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "CacheableKey.hpp"
#include "CacheableBuiltins.hpp"
diff --git a/cppcache/include/geode/EntryEvent.hpp b/cppcache/include/geode/EntryEvent.hpp
index 52c2ca8..56f7f79 100644
--- a/cppcache/include/geode/EntryEvent.hpp
+++ b/cppcache/include/geode/EntryEvent.hpp
@@ -24,7 +24,7 @@
#include "CacheableKey.hpp"
#include "Region.hpp"
-#include "geode/Cacheable.hpp"
+#include "geode/Serializable.hpp"
#include "internal/geode_globals.hpp"
/** @file
diff --git a/cppcache/include/geode/PartitionResolver.hpp b/cppcache/include/geode/PartitionResolver.hpp
index 77b23e8..560a5d5 100644
--- a/cppcache/include/geode/PartitionResolver.hpp
+++ b/cppcache/include/geode/PartitionResolver.hpp
@@ -24,7 +24,7 @@
#include <memory>
#include <string>
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "internal/geode_base.hpp"
namespace apache {
diff --git a/cppcache/include/geode/PersistenceManager.hpp b/cppcache/include/geode/PersistenceManager.hpp
index 1c8dc50..867528a 100644
--- a/cppcache/include/geode/PersistenceManager.hpp
+++ b/cppcache/include/geode/PersistenceManager.hpp
@@ -23,7 +23,7 @@
#include <memory>
#include "internal/geode_globals.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
/**
* @file
diff --git a/cppcache/include/geode/Properties.hpp b/cppcache/include/geode/Properties.hpp
index 31d3b86..350a670 100644
--- a/cppcache/include/geode/Properties.hpp
+++ b/cppcache/include/geode/Properties.hpp
@@ -29,7 +29,7 @@
#include "internal/geode_globals.hpp"
#include "Serializable.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "internal/chrono/duration.hpp"
namespace apache {
diff --git a/cppcache/include/geode/Region.hpp b/cppcache/include/geode/Region.hpp
index cf3bff1..84e1983 100644
--- a/cppcache/include/geode/Region.hpp
+++ b/cppcache/include/geode/Region.hpp
@@ -31,7 +31,7 @@
#include "CacheableString.hpp"
#include "CacheableString.hpp"
#include "ExceptionTypes.hpp"
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "AttributesFactory.hpp"
#include "AttributesMutator.hpp"
#include "CacheListener.hpp"
diff --git a/cppcache/include/geode/Serializable.hpp b/cppcache/include/geode/Serializable.hpp
index e2edd97..2a13833 100644
--- a/cppcache/include/geode/Serializable.hpp
+++ b/cppcache/include/geode/Serializable.hpp
@@ -140,6 +140,8 @@ class _GEODE_EXPORT Serializable {
Serializable& operator=(const Serializable& other) = default;
};
+typedef Serializable Cacheable;
+
} // namespace client
} // namespace geode
} // namespace apache
diff --git a/cppcache/include/geode/WritablePdxInstance.hpp b/cppcache/include/geode/WritablePdxInstance.hpp
index c56fb02..8e122eb 100644
--- a/cppcache/include/geode/WritablePdxInstance.hpp
+++ b/cppcache/include/geode/WritablePdxInstance.hpp
@@ -22,7 +22,7 @@
#include <memory>
-#include "Cacheable.hpp"
+#include "Serializable.hpp"
#include "PdxInstance.hpp"
namespace apache {
diff --git a/cppcache/src/AdminRegion.hpp b/cppcache/src/AdminRegion.hpp
index 9ded6b2..90544ea 100644
--- a/cppcache/src/AdminRegion.hpp
+++ b/cppcache/src/AdminRegion.hpp
@@ -24,7 +24,7 @@
#include <string>
#include <geode/Serializable.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include "ReadWriteLock.hpp"
#include "NonCopyable.hpp"
diff --git a/cppcache/src/CacheableObjectPartList.hpp b/cppcache/src/CacheableObjectPartList.hpp
index 8cc86ea..50b8bec 100644
--- a/cppcache/src/CacheableObjectPartList.hpp
+++ b/cppcache/src/CacheableObjectPartList.hpp
@@ -25,7 +25,7 @@
#include <geode/internal/geode_globals.hpp>
#include <geode/DataOutput.hpp>
#include <geode/DataInput.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include "MapWithLock.hpp"
#include "HashMapOfException.hpp"
diff --git a/cppcache/src/CacheableToken.hpp b/cppcache/src/CacheableToken.hpp
index 9d380c6..60d51b9 100644
--- a/cppcache/src/CacheableToken.hpp
+++ b/cppcache/src/CacheableToken.hpp
@@ -21,7 +21,7 @@
#define GEODE_CACHEABLETOKEN_H_
#include <geode/internal/geode_globals.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
namespace apache {
namespace geode {
diff --git a/cppcache/src/ClientMetadataService.hpp b/cppcache/src/ClientMetadataService.hpp
index fd4d45f..ce6209d 100644
--- a/cppcache/src/ClientMetadataService.hpp
+++ b/cppcache/src/ClientMetadataService.hpp
@@ -27,7 +27,7 @@
#include <ace/Task.h>
#include <geode/CacheableKey.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <geode/Region.hpp>
#include <geode/internal/functional.hpp>
diff --git a/cppcache/src/CqEventImpl.hpp b/cppcache/src/CqEventImpl.hpp
index e81a713..3c37052 100644
--- a/cppcache/src/CqEventImpl.hpp
+++ b/cppcache/src/CqEventImpl.hpp
@@ -27,7 +27,7 @@
#include <geode/CqOperation.hpp>
#include <geode/CqQuery.hpp>
#include <geode/CacheableKey.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <geode/Exception.hpp>
namespace apache {
diff --git a/cppcache/src/Delta.cpp b/cppcache/src/Delta.cpp
index 6d2020b..74a262e 100644
--- a/cppcache/src/Delta.cpp
+++ b/cppcache/src/Delta.cpp
@@ -17,7 +17,7 @@
#include <geode/Delta.hpp>
#include <geode/Cache.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
namespace apache {
namespace geode {
diff --git a/cppcache/src/EventId.hpp b/cppcache/src/EventId.hpp
index 76446bf..f42a4de 100644
--- a/cppcache/src/EventId.hpp
+++ b/cppcache/src/EventId.hpp
@@ -21,7 +21,7 @@
#define GEODE_EVENTID_H_
#include <geode/internal/geode_globals.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include "GeodeTypeIdsImpl.hpp"
#include <geode/DataOutput.hpp>
diff --git a/cppcache/src/FarSideEntryOp.hpp b/cppcache/src/FarSideEntryOp.hpp
index 6d5211d..2b5e684 100644
--- a/cppcache/src/FarSideEntryOp.hpp
+++ b/cppcache/src/FarSideEntryOp.hpp
@@ -27,7 +27,7 @@
*/
#include <geode/internal/geode_globals.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <geode/DataOutput.hpp>
#include <geode/DataInput.hpp>
#include "LocalRegion.hpp"
diff --git a/cppcache/src/LocalRegion.hpp b/cppcache/src/LocalRegion.hpp
index c6f4b9f..40b776b 100644
--- a/cppcache/src/LocalRegion.hpp
+++ b/cppcache/src/LocalRegion.hpp
@@ -28,7 +28,7 @@
#include <geode/CacheStatistics.hpp>
#include <geode/ExceptionTypes.hpp>
#include <geode/CacheableKey.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <geode/Cache.hpp>
#include <geode/EntryEvent.hpp>
#include <geode/RegionEvent.hpp>
diff --git a/cppcache/src/MapEntry.hpp b/cppcache/src/MapEntry.hpp
index 5526536..080b314 100644
--- a/cppcache/src/MapEntry.hpp
+++ b/cppcache/src/MapEntry.hpp
@@ -25,7 +25,7 @@
#include <utility>
#include <geode/internal/geode_globals.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <geode/CacheableKey.hpp>
#include <geode/ExceptionTypes.hpp>
diff --git a/cppcache/src/TcrMessage.hpp b/cppcache/src/TcrMessage.hpp
index bb8de4d..ecf84bc 100644
--- a/cppcache/src/TcrMessage.hpp
+++ b/cppcache/src/TcrMessage.hpp
@@ -28,7 +28,7 @@
#include <ace/OS.h>
#include <geode/internal/geode_globals.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <geode/CacheableKey.hpp>
#include <geode/CacheableString.hpp>
#include <geode/DataOutput.hpp>
diff --git a/cppcache/src/TransactionalOperation.hpp b/cppcache/src/TransactionalOperation.hpp
index 7146f9f..b083420 100644
--- a/cppcache/src/TransactionalOperation.hpp
+++ b/cppcache/src/TransactionalOperation.hpp
@@ -27,7 +27,7 @@
*/
#include <geode/internal/geode_globals.hpp>
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include <vector>
namespace apache {
namespace geode {
diff --git a/cppcache/src/VersionTag.hpp b/cppcache/src/VersionTag.hpp
index 41ea573..a291393 100644
--- a/cppcache/src/VersionTag.hpp
+++ b/cppcache/src/VersionTag.hpp
@@ -20,7 +20,7 @@
#ifndef GEODE_VERSIONTAG_H_
#define GEODE_VERSIONTAG_H_
-#include <geode/Cacheable.hpp>
+#include <geode/Serializable.hpp>
#include "GeodeTypeIdsImpl.hpp"
#include "MemberListForVersionStamp.hpp"
--
To stop receiving notification emails like this one, please contact
jbarrett@apache.org.