Repository: geode Updated Branches: refs/heads/next-gen-native-client-software-grant cc1486f8b -> 750001121
GEODE-2342: Update GemfireTypeIds (files and references) to GeodeTypeIds. This closes #354 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/75000112 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/75000112 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/75000112 Branch: refs/heads/next-gen-native-client-software-grant Commit: 750001121b85eb356124435e4a0ac7ee965f3baf Parents: cc1486f Author: Mike Martell <mmart...@pivotal.io> Authored: Tue Jan 24 13:31:35 2017 -0800 Committer: Jacob Barrett <jbarr...@pivotal.io> Committed: Tue Jan 24 14:15:12 2017 -0800 ---------------------------------------------------------------------- examples/dist/cacheRunner/TestCacheCallback.cpp | 2 +- src/clicache/src/CacheableObjectArray.cpp | 2 +- src/clicache/src/CacheableStack.cpp | 2 +- src/clicache/src/DataInput.cpp | 4 +- src/clicache/src/DataOutput.cpp | 2 +- src/clicache/src/DistributedSystem.cpp | 2 +- src/clicache/src/GemFireClassIds.hpp | 2 +- src/clicache/src/Serializable.cpp | 2 +- src/clicache/src/impl/ManagedCacheableDelta.cpp | 2 +- .../src/impl/ManagedCacheableDeltaBytes.cpp | 2 +- src/clicache/src/impl/ManagedCacheableKey.cpp | 2 +- src/clicache/src/impl/ManagedCacheableKey.hpp | 2 +- .../src/impl/ManagedCacheableKeyBytes.cpp | 2 +- src/clicache/src/impl/PdxFieldType.cpp | 2 +- .../src/impl/PdxManagedCacheableKey.cpp | 2 +- .../src/impl/PdxManagedCacheableKey.hpp | 2 +- .../src/impl/PdxManagedCacheableKeyBytes.cpp | 2 +- .../src/impl/PdxReaderWithTypeCollector.cpp | 2 +- .../src/impl/PdxWriterWithTypeCollector.cpp | 2 +- src/cppcache/include/gfcpp/CacheableDate.hpp | 2 +- src/cppcache/include/gfcpp/CacheableString.hpp | 2 +- src/cppcache/include/gfcpp/GemfireTypeIds.hpp | 85 -------------------- src/cppcache/include/gfcpp/GeodeTypeIds.hpp | 85 ++++++++++++++++++++ .../include/gfcpp/PdxAutoSerializer.hpp | 2 +- src/cppcache/include/gfcpp/Serializer.hpp | 2 +- .../integration-test/testSerialization.cpp | 4 +- src/cppcache/src/CacheAttributes.cpp | 2 +- src/cppcache/src/CacheableDate.cpp | 2 +- src/cppcache/src/CacheableEnum.cpp | 2 +- src/cppcache/src/CacheableFileName.cpp | 2 +- src/cppcache/src/CacheableObjectArray.cpp | 4 +- src/cppcache/src/CacheableObjectPartList.cpp | 2 +- src/cppcache/src/CacheableString.cpp | 2 +- src/cppcache/src/CacheableToken.cpp | 2 +- src/cppcache/src/CacheableUndefined.cpp | 4 +- src/cppcache/src/CachedDeserializableHelper.hpp | 2 +- src/cppcache/src/ClientConnectionRequest.cpp | 2 +- src/cppcache/src/ClientProxyMembershipID.cpp | 4 +- src/cppcache/src/ClientProxyMembershipID.hpp | 2 +- src/cppcache/src/ClientReplacementRequest.cpp | 2 +- src/cppcache/src/DiskStoreId.hpp | 2 +- src/cppcache/src/DiskVersionTag.hpp | 2 +- src/cppcache/src/EnumInfo.cpp | 2 +- src/cppcache/src/EnumInfo.hpp | 2 +- src/cppcache/src/EventId.cpp | 2 +- src/cppcache/src/EventId.hpp | 2 +- .../src/GatewayEventCallbackArgument.hpp | 2 +- .../src/GatewaySenderEventCallbackArgument.hpp | 2 +- src/cppcache/src/GemfireTypeIdsImpl.hpp | 82 ------------------- src/cppcache/src/GeodeTypeIdsImpl.hpp | 82 +++++++++++++++++++ src/cppcache/src/GetAllServersRequest.hpp | 2 +- src/cppcache/src/LocatorListRequest.cpp | 2 +- src/cppcache/src/LocatorListRequest.hpp | 2 +- src/cppcache/src/LocatorListResponse.hpp | 2 +- src/cppcache/src/PdxEnumInstantiator.cpp | 2 +- src/cppcache/src/PdxFieldType.cpp | 2 +- src/cppcache/src/PdxInstantiator.cpp | 2 +- src/cppcache/src/PdxLocalWriter.cpp | 2 +- src/cppcache/src/PdxSerializable.cpp | 2 +- src/cppcache/src/PdxType.cpp | 2 +- src/cppcache/src/Properties.cpp | 2 +- src/cppcache/src/QueueConnectionRequest.cpp | 2 +- src/cppcache/src/QueueConnectionResponse.cpp | 2 +- src/cppcache/src/RegionAttributes.cpp | 2 +- src/cppcache/src/RemoteQuery.cpp | 2 +- src/cppcache/src/Serializable.cpp | 2 +- src/cppcache/src/SerializationRegistry.cpp | 4 +- src/cppcache/src/SerializationRegistry.hpp | 4 +- src/cppcache/src/ServerLocation.hpp | 2 +- src/cppcache/src/ServerLocationRequest.cpp | 2 +- src/cppcache/src/ServerLocationResponse.hpp | 2 +- src/cppcache/src/Struct.cpp | 2 +- src/cppcache/src/TcrConnection.cpp | 2 +- src/cppcache/src/TcrMessage.hpp | 2 +- src/cppcache/src/ThinClientRegion.cpp | 2 +- src/cppcache/src/VersionTag.hpp | 2 +- .../src/VersionedCacheableObjectPartList.cpp | 2 +- 77 files changed, 247 insertions(+), 247 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/examples/dist/cacheRunner/TestCacheCallback.cpp ---------------------------------------------------------------------- diff --git a/examples/dist/cacheRunner/TestCacheCallback.cpp b/examples/dist/cacheRunner/TestCacheCallback.cpp index 7e49371..62469fc 100644 --- a/examples/dist/cacheRunner/TestCacheCallback.cpp +++ b/examples/dist/cacheRunner/TestCacheCallback.cpp @@ -22,7 +22,7 @@ * @see */ #include <gfcpp/CacheableBuiltins.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include "TestCacheCallback.hpp" #include "ExampleObject.hpp" #include "User.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/CacheableObjectArray.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableObjectArray.cpp b/src/clicache/src/CacheableObjectArray.cpp index 8a4803d..95650a4 100644 --- a/src/clicache/src/CacheableObjectArray.cpp +++ b/src/clicache/src/CacheableObjectArray.cpp @@ -18,7 +18,7 @@ //#include "gf_includes.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "CacheableObjectArray.hpp" #include "DataOutput.hpp" #include "DataInput.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/CacheableStack.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableStack.cpp b/src/clicache/src/CacheableStack.cpp index 060b8b9..a6525c4 100644 --- a/src/clicache/src/CacheableStack.cpp +++ b/src/clicache/src/CacheableStack.cpp @@ -21,7 +21,7 @@ #include "CacheableStack.hpp" #include "DataOutput.hpp" #include "DataInput.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "impl/SafeConvert.hpp" #include "GemFireClassIds.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/DataInput.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DataInput.cpp b/src/clicache/src/DataInput.cpp index d2614d2..11ccde8 100644 --- a/src/clicache/src/DataInput.cpp +++ b/src/clicache/src/DataInput.cpp @@ -21,8 +21,8 @@ //#include "CacheFactory.hpp" #include "Cache.hpp" #include <vcclr.h> -//#include <gfcpp/GemfireTypeIds.hpp> -#include <GemfireTypeIdsImpl.hpp> +//#include <gfcpp/GeodeTypeIds.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "CacheableString.hpp" #include "CacheableHashMap.hpp" #include "CacheableStack.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/DataOutput.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DataOutput.cpp b/src/clicache/src/DataOutput.cpp index 5a16b8e..4bd0f15 100644 --- a/src/clicache/src/DataOutput.cpp +++ b/src/clicache/src/DataOutput.cpp @@ -17,7 +17,7 @@ //#include "gf_includes.hpp" #include "DataOutput.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include <vcclr.h> #include "IGFSerializable.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/DistributedSystem.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp index 40e942a..950a712 100644 --- a/src/clicache/src/DistributedSystem.cpp +++ b/src/clicache/src/DistributedSystem.cpp @@ -44,7 +44,7 @@ #include <gfcpp/CacheListener.hpp> #include <gfcpp/FixedPartitionResolver.hpp> #include <gfcpp/CacheWriter.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <CacheImpl.hpp> #include <PooledBasePool.hpp> #include <CacheXmlParser.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/GemFireClassIds.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/GemFireClassIds.hpp b/src/clicache/src/GemFireClassIds.hpp index 03973e2..bfe3063 100644 --- a/src/clicache/src/GemFireClassIds.hpp +++ b/src/clicache/src/GemFireClassIds.hpp @@ -20,7 +20,7 @@ #include "gf_defs.hpp" -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> namespace Apache http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/Serializable.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Serializable.cpp b/src/clicache/src/Serializable.cpp index 6acaeb3..a32792d 100644 --- a/src/clicache/src/Serializable.cpp +++ b/src/clicache/src/Serializable.cpp @@ -30,7 +30,7 @@ #include "CacheableBuiltins.hpp" //#include "ExceptionTypes.hpp" #include "impl/SafeConvert.hpp" -//#include <GemfireTypeIdsImpl.hpp> +//#include <GeodeTypeIds.hpp> //#include "CacheableHashMap.hpp" #include "CacheableHashTable.hpp" #include "Struct.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/ManagedCacheableDelta.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp index c81841a..e8d563c 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.cpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.cpp @@ -20,7 +20,7 @@ #include "../DataInput.hpp" #include "../DataOutput.hpp" #include "../CacheableString.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../ExceptionTypes.hpp" #include "SafeConvert.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp index 710ccb0..64c9b95 100644 --- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp +++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp @@ -20,7 +20,7 @@ #include "../DataInput.hpp" #include "../DataOutput.hpp" #include "../CacheableString.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../ExceptionTypes.hpp" #include "SafeConvert.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/ManagedCacheableKey.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKey.cpp b/src/clicache/src/impl/ManagedCacheableKey.cpp index c869cc6..5bf418c 100644 --- a/src/clicache/src/impl/ManagedCacheableKey.cpp +++ b/src/clicache/src/impl/ManagedCacheableKey.cpp @@ -21,7 +21,7 @@ #include "../DataInput.hpp" #include "../DataOutput.hpp" #include "../CacheableString.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../ExceptionTypes.hpp" #include "../Log.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/ManagedCacheableKey.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKey.hpp b/src/clicache/src/impl/ManagedCacheableKey.hpp index 3dc9099..33ba785 100644 --- a/src/clicache/src/impl/ManagedCacheableKey.hpp +++ b/src/clicache/src/impl/ManagedCacheableKey.hpp @@ -20,7 +20,7 @@ #include "../gf_defs.hpp" #include <vcclr.h> #include <gfcpp/CacheableKey.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../IGFSerializable.hpp" using namespace System; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp index 78c5f34..afd9219 100644 --- a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp +++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp @@ -21,7 +21,7 @@ #include "../DataOutput.hpp" #include "../Serializable.hpp" #include "../CacheableString.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../ExceptionTypes.hpp" #include "ManagedString.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/PdxFieldType.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxFieldType.cpp b/src/clicache/src/impl/PdxFieldType.cpp index c47577d..790cd5b 100644 --- a/src/clicache/src/impl/PdxFieldType.cpp +++ b/src/clicache/src/impl/PdxFieldType.cpp @@ -17,7 +17,7 @@ #pragma once #include "PdxFieldType.hpp" -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> using namespace System; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/PdxManagedCacheableKey.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.cpp b/src/clicache/src/impl/PdxManagedCacheableKey.cpp index 4774647..6349402 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKey.cpp +++ b/src/clicache/src/impl/PdxManagedCacheableKey.cpp @@ -21,7 +21,7 @@ #include "../DataInput.hpp" #include "../DataOutput.hpp" #include "../CacheableString.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../ExceptionTypes.hpp" #include "ManagedString.hpp" #include "PdxHelper.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/PdxManagedCacheableKey.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.hpp b/src/clicache/src/impl/PdxManagedCacheableKey.hpp index 457fb2e..9350756 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKey.hpp +++ b/src/clicache/src/impl/PdxManagedCacheableKey.hpp @@ -20,7 +20,7 @@ #include "../gf_defs.hpp" #include <vcclr.h> #include <gfcpp/CacheableKey.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../IPdxSerializable.hpp" #include <gfcpp/Delta.hpp> #include "../IGFDelta.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp index 1702327..4990e17 100644 --- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp +++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp @@ -21,7 +21,7 @@ #include "../DataOutput.hpp" #include "../Serializable.hpp" #include "../CacheableString.hpp" -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include "../ExceptionTypes.hpp" #include "ManagedString.hpp" #include "SafeConvert.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp b/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp index a1bfe13..a9b9dca 100644 --- a/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp +++ b/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp @@ -16,7 +16,7 @@ */ #include "PdxReaderWithTypeCollector.hpp" -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include "../GemFireClassIds.hpp" using namespace System; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp b/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp index f607b8e..4a5de65 100644 --- a/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp +++ b/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp @@ -17,7 +17,7 @@ #include "PdxWriterWithTypeCollector.hpp" #include "../DataOutput.hpp" -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include "../GemFireClassIds.hpp" #include "PdxHelper.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/include/gfcpp/CacheableDate.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/include/gfcpp/CacheableDate.hpp b/src/cppcache/include/gfcpp/CacheableDate.hpp index 2362fe0..97b9f74 100644 --- a/src/cppcache/include/gfcpp/CacheableDate.hpp +++ b/src/cppcache/include/gfcpp/CacheableDate.hpp @@ -21,7 +21,7 @@ #include "gf_types.hpp" #include "CacheableKey.hpp" #include "CacheableString.hpp" -#include "GemfireTypeIds.hpp" +#include "GeodeTypeIds.hpp" #include "ExceptionTypes.hpp" #include <time.h> #ifdef _WIN32 http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/include/gfcpp/CacheableString.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/include/gfcpp/CacheableString.hpp b/src/cppcache/include/gfcpp/CacheableString.hpp index eb51009..478d4e8 100644 --- a/src/cppcache/include/gfcpp/CacheableString.hpp +++ b/src/cppcache/include/gfcpp/CacheableString.hpp @@ -21,7 +21,7 @@ #include "gfcpp_globals.hpp" #include "gf_types.hpp" #include "CacheableKey.hpp" -#include "GemfireTypeIds.hpp" +#include "GeodeTypeIds.hpp" #include "ExceptionTypes.hpp" /** @file http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/include/gfcpp/GemfireTypeIds.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/include/gfcpp/GemfireTypeIds.hpp b/src/cppcache/include/gfcpp/GemfireTypeIds.hpp deleted file mode 100644 index c60f273..0000000 --- a/src/cppcache/include/gfcpp/GemfireTypeIds.hpp +++ /dev/null @@ -1,85 +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. - */ -#ifndef _GEMFIRE_GEMFIRETYPEIDS_HPP_ -#define _GEMFIRE_GEMFIRETYPEIDS_HPP_ - -namespace apache { -namespace geode { -namespace client { - -class GemfireTypeIds { - public: - // User visible IDs here - // Internal IDs are in GemfireTypeIdsImpl.hpp - - enum IdValues { - // Do not use IDs 5 and 6 which are used by .NET - // ManagedObject and ManagedObjectXml. If those are - // required then change those in GemfireTypeIdsM.hpp - - // keep the following in alphabetical order please. - EnumInfo = 9, - CacheableLinkedList = 10, - Properties = 11, - PdxType = 17, // internal hack to read pdxtype in c# layer, look usuage in - // TcrMessage and C# DistributedM.cpp - BooleanArray = 26, - CharArray = 27, - RegionAttributes = 30, // because there's no equivalence in java - CacheableUndefined = 31, - Struct = 32, - NullObj = 41, - CacheableString = 42, - CacheableBytes = 46, - CacheableInt16Array = 47, - CacheableInt32Array = 48, - CacheableInt64Array = 49, - CacheableFloatArray = 50, - CacheableDoubleArray = 51, - CacheableObjectArray = 52, - CacheableBoolean = 53, - CacheableWideChar = 54, - CacheableByte = 55, - CacheableInt16 = 56, - CacheableInt32 = 57, - CacheableInt64 = 58, - CacheableFloat = 59, - CacheableDouble = 60, - CacheableDate = 61, - CacheableFileName = 63, - CacheableStringArray = 64, - CacheableArrayList = 65, - CacheableHashSet = 66, - CacheableHashMap = 67, - CacheableTimeUnit = 68, - CacheableNullString = 69, - CacheableHashTable = 70, - CacheableVector = 71, - CacheableIdentityHashMap = 72, - CacheableLinkedHashSet = 73, - CacheableStack = 74, - CacheableASCIIString = 87, - CacheableASCIIStringHuge = 88, - CacheableStringHuge = 89, - CacheableEnum = 94 - }; -}; -} // namespace client -} // namespace geode -} // namespace apache - -#endif http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/include/gfcpp/GeodeTypeIds.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/include/gfcpp/GeodeTypeIds.hpp b/src/cppcache/include/gfcpp/GeodeTypeIds.hpp new file mode 100644 index 0000000..bdff092 --- /dev/null +++ b/src/cppcache/include/gfcpp/GeodeTypeIds.hpp @@ -0,0 +1,85 @@ +/* + * 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. + */ +#ifndef _GEMFIRE_GEMFIRETYPEIDS_HPP_ +#define _GEMFIRE_GEMFIRETYPEIDS_HPP_ + +namespace apache { +namespace geode { +namespace client { + +class GemfireTypeIds { + public: + // User visible IDs here + // Internal IDs are in GeodeTypeIds.hpp + + enum IdValues { + // Do not use IDs 5 and 6 which are used by .NET + // ManagedObject and ManagedObjectXml. If those are + // required then change those in GemfireTypeIdsM.hpp + + // keep the following in alphabetical order please. + EnumInfo = 9, + CacheableLinkedList = 10, + Properties = 11, + PdxType = 17, // internal hack to read pdxtype in c# layer, look usuage in + // TcrMessage and C# DistributedM.cpp + BooleanArray = 26, + CharArray = 27, + RegionAttributes = 30, // because there's no equivalence in java + CacheableUndefined = 31, + Struct = 32, + NullObj = 41, + CacheableString = 42, + CacheableBytes = 46, + CacheableInt16Array = 47, + CacheableInt32Array = 48, + CacheableInt64Array = 49, + CacheableFloatArray = 50, + CacheableDoubleArray = 51, + CacheableObjectArray = 52, + CacheableBoolean = 53, + CacheableWideChar = 54, + CacheableByte = 55, + CacheableInt16 = 56, + CacheableInt32 = 57, + CacheableInt64 = 58, + CacheableFloat = 59, + CacheableDouble = 60, + CacheableDate = 61, + CacheableFileName = 63, + CacheableStringArray = 64, + CacheableArrayList = 65, + CacheableHashSet = 66, + CacheableHashMap = 67, + CacheableTimeUnit = 68, + CacheableNullString = 69, + CacheableHashTable = 70, + CacheableVector = 71, + CacheableIdentityHashMap = 72, + CacheableLinkedHashSet = 73, + CacheableStack = 74, + CacheableASCIIString = 87, + CacheableASCIIStringHuge = 88, + CacheableStringHuge = 89, + CacheableEnum = 94 + }; +}; +} // namespace client +} // namespace geode +} // namespace apache + +#endif http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp b/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp index e49cbce..6d3719f 100644 --- a/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp +++ b/src/cppcache/include/gfcpp/PdxAutoSerializer.hpp @@ -24,7 +24,7 @@ #include "VectorT.hpp" #include "HashMapT.hpp" #include "HashSetT.hpp" -#include "GemfireTypeIds.hpp" +#include "GeodeTypeIds.hpp" #include "TypeHelper.hpp" namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/include/gfcpp/Serializer.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/include/gfcpp/Serializer.hpp b/src/cppcache/include/gfcpp/Serializer.hpp index 0ef3096..e998d84 100644 --- a/src/cppcache/include/gfcpp/Serializer.hpp +++ b/src/cppcache/include/gfcpp/Serializer.hpp @@ -24,7 +24,7 @@ #include "VectorT.hpp" #include "HashMapT.hpp" #include "HashSetT.hpp" -#include "GemfireTypeIds.hpp" +#include "GeodeTypeIds.hpp" #include "TypeHelper.hpp" namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/integration-test/testSerialization.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testSerialization.cpp b/src/cppcache/integration-test/testSerialization.cpp index 8568139..6dd463e 100644 --- a/src/cppcache/integration-test/testSerialization.cpp +++ b/src/cppcache/integration-test/testSerialization.cpp @@ -25,8 +25,8 @@ #include <gfcpp/GemfireCppCache.hpp> #include <SerializationRegistry.hpp> #include <gfcpp/CacheableString.hpp> -#include <gfcpp/GemfireTypeIds.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <gfcpp/GeodeTypeIds.hpp> +#include <GeodeTypeIdsImpl.hpp> // Use to init lib when testing components. #include <CppCacheLibrary.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheAttributes.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheAttributes.cpp b/src/cppcache/src/CacheAttributes.cpp index 75b906a..86e8f66 100644 --- a/src/cppcache/src/CacheAttributes.cpp +++ b/src/cppcache/src/CacheAttributes.cpp @@ -18,7 +18,7 @@ #include <Utils.hpp> #include <string.h> #include <stdlib.h> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <gfcpp/CacheAttributes.hpp> using namespace apache::geode::client; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableDate.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableDate.cpp b/src/cppcache/src/CacheableDate.cpp index ee193ea..d01dd24 100644 --- a/src/cppcache/src/CacheableDate.cpp +++ b/src/cppcache/src/CacheableDate.cpp @@ -21,7 +21,7 @@ #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> #include <gfcpp/ExceptionTypes.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <cwchar> #include <ace/OS.h> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableEnum.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableEnum.cpp b/src/cppcache/src/CacheableEnum.cpp index 39c0254..1d4d0df 100644 --- a/src/cppcache/src/CacheableEnum.cpp +++ b/src/cppcache/src/CacheableEnum.cpp @@ -17,7 +17,7 @@ #include <gfcpp/CacheableEnum.hpp> #include <Utils.hpp> #include <PdxHelper.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include <EnumInfo.hpp> namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableFileName.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableFileName.cpp b/src/cppcache/src/CacheableFileName.cpp index c2b9c55..a3dc779 100644 --- a/src/cppcache/src/CacheableFileName.cpp +++ b/src/cppcache/src/CacheableFileName.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include <gfcpp/CacheableFileName.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableObjectArray.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableObjectArray.cpp b/src/cppcache/src/CacheableObjectArray.cpp index 29e821d..44bf3cc 100644 --- a/src/cppcache/src/CacheableObjectArray.cpp +++ b/src/cppcache/src/CacheableObjectArray.cpp @@ -18,8 +18,8 @@ #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> #include <gfcpp/ExceptionTypes.hpp> -#include <gfcpp/GemfireTypeIds.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <gfcpp/GeodeTypeIds.hpp> +#include <GeodeTypeIdsImpl.hpp> namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableObjectPartList.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableObjectPartList.cpp b/src/cppcache/src/CacheableObjectPartList.cpp index e1d42a6..750a0de 100644 --- a/src/cppcache/src/CacheableObjectPartList.cpp +++ b/src/cppcache/src/CacheableObjectPartList.cpp @@ -16,7 +16,7 @@ */ #include "CacheableObjectPartList.hpp" #include <gfcpp/ExceptionTypes.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/CacheableString.hpp> #include "ThinClientRegion.hpp" #include "CacheableToken.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableString.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableString.cpp b/src/cppcache/src/CacheableString.cpp index 60f1022..50d638d 100644 --- a/src/cppcache/src/CacheableString.cpp +++ b/src/cppcache/src/CacheableString.cpp @@ -18,7 +18,7 @@ #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> #include <gfcpp/ExceptionTypes.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <Utils.hpp> #include <cwchar> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableToken.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableToken.cpp b/src/cppcache/src/CacheableToken.cpp index b939773..833c7f3 100644 --- a/src/cppcache/src/CacheableToken.cpp +++ b/src/cppcache/src/CacheableToken.cpp @@ -21,7 +21,7 @@ #include <gfcpp/DataInput.hpp> #include <gfcpp/DataOutput.hpp> #include <gfcpp/CacheableString.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" using namespace apache::geode::client; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CacheableUndefined.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CacheableUndefined.cpp b/src/cppcache/src/CacheableUndefined.cpp index 3d40dca..551a1ce 100644 --- a/src/cppcache/src/CacheableUndefined.cpp +++ b/src/cppcache/src/CacheableUndefined.cpp @@ -17,8 +17,8 @@ #include <gfcpp/CacheableUndefined.hpp> #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> -#include <gfcpp/GemfireTypeIds.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <gfcpp/GeodeTypeIds.hpp> +#include <GeodeTypeIdsImpl.hpp> namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/CachedDeserializableHelper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/CachedDeserializableHelper.hpp b/src/cppcache/src/CachedDeserializableHelper.hpp index 6eb30b4..e054470 100644 --- a/src/cppcache/src/CachedDeserializableHelper.hpp +++ b/src/cppcache/src/CachedDeserializableHelper.hpp @@ -20,7 +20,7 @@ #include <gfcpp/Cacheable.hpp> #include <gfcpp/DataInput.hpp> #include <gfcpp/ExceptionTypes.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ClientConnectionRequest.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ClientConnectionRequest.cpp b/src/cppcache/src/ClientConnectionRequest.cpp index 4470f82..57f8849 100644 --- a/src/cppcache/src/ClientConnectionRequest.cpp +++ b/src/cppcache/src/ClientConnectionRequest.cpp @@ -17,7 +17,7 @@ #include "ClientConnectionRequest.hpp" #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" using namespace apache::geode::client; void ClientConnectionRequest::toData(DataOutput& output) const { // output.writeASCII( m_servergroup.c_str() ); http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ClientProxyMembershipID.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ClientProxyMembershipID.cpp b/src/cppcache/src/ClientProxyMembershipID.cpp index 28c7130..445105e 100644 --- a/src/cppcache/src/ClientProxyMembershipID.cpp +++ b/src/cppcache/src/ClientProxyMembershipID.cpp @@ -19,8 +19,8 @@ #include <time.h> #include <ace/OS.h> #include <gfcpp/DistributedSystem.hpp> -#include <gfcpp/GemfireTypeIds.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include <gfcpp/GeodeTypeIds.hpp> +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/CacheableBuiltins.hpp> #include "Version.hpp" #include <string> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ClientProxyMembershipID.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ClientProxyMembershipID.hpp b/src/cppcache/src/ClientProxyMembershipID.hpp index bd70ee8..dc4147c 100644 --- a/src/cppcache/src/ClientProxyMembershipID.hpp +++ b/src/cppcache/src/ClientProxyMembershipID.hpp @@ -20,7 +20,7 @@ #include <gfcpp/gfcpp_globals.hpp> #include <gfcpp/DataOutput.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "DSMemberForVersionStamp.hpp" #include <ace/OS.h> #include <string> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ClientReplacementRequest.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ClientReplacementRequest.cpp b/src/cppcache/src/ClientReplacementRequest.cpp index a9cecd0..c41a2e8 100644 --- a/src/cppcache/src/ClientReplacementRequest.cpp +++ b/src/cppcache/src/ClientReplacementRequest.cpp @@ -18,7 +18,7 @@ #include "ClientReplacementRequest.hpp" #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" using namespace apache::geode::client; void ClientReplacementRequest::toData(DataOutput& output) const { ClientConnectionRequest::toData(output); http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/DiskStoreId.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/DiskStoreId.hpp b/src/cppcache/src/DiskStoreId.hpp index 8e2ecbe..0d1d2e6 100644 --- a/src/cppcache/src/DiskStoreId.hpp +++ b/src/cppcache/src/DiskStoreId.hpp @@ -20,7 +20,7 @@ #include <gfcpp/gfcpp_globals.hpp> #include <gfcpp/DataInput.hpp> #include "DSMemberForVersionStamp.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/DiskVersionTag.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/DiskVersionTag.hpp b/src/cppcache/src/DiskVersionTag.hpp index ba0de2d..61c6a7d 100644 --- a/src/cppcache/src/DiskVersionTag.hpp +++ b/src/cppcache/src/DiskVersionTag.hpp @@ -18,7 +18,7 @@ #define __DISKVERSIONTAG_HPP__ #include "VersionTag.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "DiskStoreId.hpp" namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/EnumInfo.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/EnumInfo.cpp b/src/cppcache/src/EnumInfo.cpp index 6bbd59f..7b7158c 100644 --- a/src/cppcache/src/EnumInfo.cpp +++ b/src/cppcache/src/EnumInfo.cpp @@ -16,7 +16,7 @@ */ #include "EnumInfo.hpp" #include "Utils.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/EnumInfo.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/EnumInfo.hpp b/src/cppcache/src/EnumInfo.hpp index 0fe3e77..d6f8225 100644 --- a/src/cppcache/src/EnumInfo.hpp +++ b/src/cppcache/src/EnumInfo.hpp @@ -17,7 +17,7 @@ #ifndef ENUM_INFO_HPP #define ENUM_INFO_HPP -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <gfcpp/CacheableString.hpp> #include <gfcpp/CacheableKey.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/EventId.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/EventId.cpp b/src/cppcache/src/EventId.cpp index 8e8fc3f..31801c4 100644 --- a/src/cppcache/src/EventId.cpp +++ b/src/cppcache/src/EventId.cpp @@ -16,7 +16,7 @@ */ #include <gfcpp/DataInput.hpp> #include "EventId.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "ClientProxyMembershipID.hpp" #include <ace/TSS_T.h> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/EventId.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/EventId.hpp b/src/cppcache/src/EventId.hpp index c36f8ef..9eab8f9 100644 --- a/src/cppcache/src/EventId.hpp +++ b/src/cppcache/src/EventId.hpp @@ -20,7 +20,7 @@ #include <gfcpp/gfcpp_globals.hpp> #include <gfcpp/gf_types.hpp> #include <gfcpp/Cacheable.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "SpinLock.hpp" #include <gfcpp/DataOutput.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/GatewayEventCallbackArgument.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/GatewayEventCallbackArgument.hpp b/src/cppcache/src/GatewayEventCallbackArgument.hpp index f084e85..1750be3 100644 --- a/src/cppcache/src/GatewayEventCallbackArgument.hpp +++ b/src/cppcache/src/GatewayEventCallbackArgument.hpp @@ -18,7 +18,7 @@ #define __GATEWAYEVENTCALLBACKARGUMENT_HPP__ #include <gfcpp/Serializable.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp index 06836ff..a5542dd 100644 --- a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp +++ b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp @@ -19,7 +19,7 @@ #define __GATEWAYSENDEREVENTCALLBACKARGUMENT_HPP__ #include <gfcpp/Serializable.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/GemfireTypeIdsImpl.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/GemfireTypeIdsImpl.hpp b/src/cppcache/src/GemfireTypeIdsImpl.hpp deleted file mode 100644 index bdec827..0000000 --- a/src/cppcache/src/GemfireTypeIdsImpl.hpp +++ /dev/null @@ -1,82 +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. - */ -#ifndef _GEMFIRE_GEMFIRETYPEIDSIMPL_HPP_ -#define _GEMFIRE_GEMFIRETYPEIDSIMPL_HPP_ - -namespace apache { -namespace geode { -namespace client { - -class GemfireTypeIdsImpl { - public: - // Internal IDs here - // User visible IDs are in GemfireTypeIds.hpp - - enum IdValues { - // keep the following in alphabetical order please. - ObjectTypeImpl = -61, - StructTypeImpl = -60, - CollectionTypeImpl = -59, - FixedIDDefault = 0, - FixedIDByte = 1, - FixedIDShort = 2, - FixedIDInt = 3, - FixedIDNone = 4, - CacheableToken = 14, // because there's no equivalence in java - VersionedObjectPartList = 7, - CacheableObjectPartList = 25, - EventId = 36, - InterestResultPolicy = 37, - ClientProxyMembershipId = 38, - CacheableUserData4 = 37, - CacheableUserData2 = 38, - CacheableUserData = 39, - CacheableUserClass = 40, - Class = 43, - JavaSerializable = 44, - DataSerializable = 45, - InternalDistributedMember = 92, - PDX = 93, - // PDX_ENUM = 94, - EntryEventImpl = 105, - RegionEventImpl = 108, - ClientHealthStats = -126, - GatewayEventCallbackArgument = -56, // 0xC8 - GatewaySenderEventCallbackArgument = -135, // 0xC8 - ClientConnectionRequest = -53, - ClientConnectionResponse = -50, - QueueConnectionRequest = -52, - QueueConnectionResponse = -49, - LocatorListRequest = -54, - LocatorListResponse = -51, - GetAllServersRequest = -43, - GetAllServersResponse = -42, - ClientReplacementRequest = -48, - VmCachedDeserializable = -64, - PreferBytesCachedDeserializable = -65, - TXCommitMessage = 110, - CacheableObjectPartList66 = 2121, - VersionTag = -120, - DiskStoreId = 2133, - DiskVersionTag = 2131 - }; -}; -} // namespace client -} // namespace geode -} // namespace apache - -#endif http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/GeodeTypeIdsImpl.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/GeodeTypeIdsImpl.hpp b/src/cppcache/src/GeodeTypeIdsImpl.hpp new file mode 100644 index 0000000..5317e1e --- /dev/null +++ b/src/cppcache/src/GeodeTypeIdsImpl.hpp @@ -0,0 +1,82 @@ +/* + * 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. + */ +#ifndef _GEMFIRE_GEMFIRETYPEIDSIMPL_HPP_ +#define _GEMFIRE_GEMFIRETYPEIDSIMPL_HPP_ + +namespace apache { +namespace geode { +namespace client { + +class GemfireTypeIdsImpl { + public: + // Internal IDs here + // User visible IDs are in GeodeTypeIds.hpp + + enum IdValues { + // keep the following in alphabetical order please. + ObjectTypeImpl = -61, + StructTypeImpl = -60, + CollectionTypeImpl = -59, + FixedIDDefault = 0, + FixedIDByte = 1, + FixedIDShort = 2, + FixedIDInt = 3, + FixedIDNone = 4, + CacheableToken = 14, // because there's no equivalence in java + VersionedObjectPartList = 7, + CacheableObjectPartList = 25, + EventId = 36, + InterestResultPolicy = 37, + ClientProxyMembershipId = 38, + CacheableUserData4 = 37, + CacheableUserData2 = 38, + CacheableUserData = 39, + CacheableUserClass = 40, + Class = 43, + JavaSerializable = 44, + DataSerializable = 45, + InternalDistributedMember = 92, + PDX = 93, + // PDX_ENUM = 94, + EntryEventImpl = 105, + RegionEventImpl = 108, + ClientHealthStats = -126, + GatewayEventCallbackArgument = -56, // 0xC8 + GatewaySenderEventCallbackArgument = -135, // 0xC8 + ClientConnectionRequest = -53, + ClientConnectionResponse = -50, + QueueConnectionRequest = -52, + QueueConnectionResponse = -49, + LocatorListRequest = -54, + LocatorListResponse = -51, + GetAllServersRequest = -43, + GetAllServersResponse = -42, + ClientReplacementRequest = -48, + VmCachedDeserializable = -64, + PreferBytesCachedDeserializable = -65, + TXCommitMessage = 110, + CacheableObjectPartList66 = 2121, + VersionTag = -120, + DiskStoreId = 2133, + DiskVersionTag = 2131 + }; +}; +} // namespace client +} // namespace geode +} // namespace apache + +#endif http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/GetAllServersRequest.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/GetAllServersRequest.hpp b/src/cppcache/src/GetAllServersRequest.hpp index 53ca8ea..40edade 100644 --- a/src/cppcache/src/GetAllServersRequest.hpp +++ b/src/cppcache/src/GetAllServersRequest.hpp @@ -21,7 +21,7 @@ #include <gfcpp/DataInput.hpp> #include <gfcpp/DataOutput.hpp> #include <gfcpp/CacheableString.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <string> namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/LocatorListRequest.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/LocatorListRequest.cpp b/src/cppcache/src/LocatorListRequest.cpp index 0296344..6811ff6 100644 --- a/src/cppcache/src/LocatorListRequest.cpp +++ b/src/cppcache/src/LocatorListRequest.cpp @@ -17,7 +17,7 @@ #include "LocatorListRequest.hpp" #include <gfcpp/DataInput.hpp> #include <gfcpp/DataOutput.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/CacheableString.hpp> using namespace apache::geode::client; LocatorListRequest::LocatorListRequest(const std::string& servergroup) http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/LocatorListRequest.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/LocatorListRequest.hpp b/src/cppcache/src/LocatorListRequest.hpp index 96f83c9..ab40845 100644 --- a/src/cppcache/src/LocatorListRequest.hpp +++ b/src/cppcache/src/LocatorListRequest.hpp @@ -18,7 +18,7 @@ #define __LOCATORLISTREQUEST__ #include <string> #include "ServerLocationRequest.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { namespace client { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/LocatorListResponse.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/LocatorListResponse.hpp b/src/cppcache/src/LocatorListResponse.hpp index e40cbc1..284a467 100644 --- a/src/cppcache/src/LocatorListResponse.hpp +++ b/src/cppcache/src/LocatorListResponse.hpp @@ -17,7 +17,7 @@ #ifndef _LOCATOR_LIST_RESPONSE_ #define _LOCATOR_LIST_RESPONSE_ #include <vector> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "ServerLocationResponse.hpp" #include "ServerLocation.hpp" namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/PdxEnumInstantiator.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/PdxEnumInstantiator.cpp b/src/cppcache/src/PdxEnumInstantiator.cpp index c06bd6a..7fdb498 100644 --- a/src/cppcache/src/PdxEnumInstantiator.cpp +++ b/src/cppcache/src/PdxEnumInstantiator.cpp @@ -19,7 +19,7 @@ */ #include "PdxEnumInstantiator.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/CacheableString.hpp> #include <gfcpp/DataInput.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/PdxFieldType.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/PdxFieldType.cpp b/src/cppcache/src/PdxFieldType.cpp index c27ef88..fb55d1f 100644 --- a/src/cppcache/src/PdxFieldType.cpp +++ b/src/cppcache/src/PdxFieldType.cpp @@ -22,7 +22,7 @@ */ #include "PdxFieldType.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "PdxTypes.hpp" #include <gfcpp/PdxFieldTypes.hpp> //#include <malloc.h> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/PdxInstantiator.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/PdxInstantiator.cpp b/src/cppcache/src/PdxInstantiator.cpp index a21b62a..eb09659 100644 --- a/src/cppcache/src/PdxInstantiator.cpp +++ b/src/cppcache/src/PdxInstantiator.cpp @@ -22,7 +22,7 @@ */ #include "PdxInstantiator.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/CacheableString.hpp> #include <gfcpp/DataInput.hpp> #include "PdxHelper.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/PdxLocalWriter.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/PdxLocalWriter.cpp b/src/cppcache/src/PdxLocalWriter.cpp index beb4c40..d16ea27 100644 --- a/src/cppcache/src/PdxLocalWriter.cpp +++ b/src/cppcache/src/PdxLocalWriter.cpp @@ -25,7 +25,7 @@ #include "PdxHelper.hpp" #include "PdxTypeRegistry.hpp" #include <gfcpp/CacheableEnum.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/PdxSerializable.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/PdxSerializable.cpp b/src/cppcache/src/PdxSerializable.cpp index 1ccc85e..9e67141 100644 --- a/src/cppcache/src/PdxSerializable.cpp +++ b/src/cppcache/src/PdxSerializable.cpp @@ -22,7 +22,7 @@ */ #include <gfcpp/PdxSerializable.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include <gfcpp/CacheableString.hpp> #include <PdxHelper.hpp> #include <gfcpp/CacheableKeys.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/PdxType.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/PdxType.cpp b/src/cppcache/src/PdxType.cpp index 4e98213..53200b4 100644 --- a/src/cppcache/src/PdxType.cpp +++ b/src/cppcache/src/PdxType.cpp @@ -23,7 +23,7 @@ #include "PdxType.hpp" #include "PdxHelper.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "PdxFieldType.hpp" #include "Utils.hpp" #include "PdxTypeRegistry.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/Properties.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/Properties.cpp b/src/cppcache/src/Properties.cpp index 48a739d..4fc7165 100644 --- a/src/cppcache/src/Properties.cpp +++ b/src/cppcache/src/Properties.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include <gfcpp/Properties.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <string> #include <ace/Hash_Map_Manager.h> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/QueueConnectionRequest.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/QueueConnectionRequest.cpp b/src/cppcache/src/QueueConnectionRequest.cpp index 7ddf1b4..47b6adb 100644 --- a/src/cppcache/src/QueueConnectionRequest.cpp +++ b/src/cppcache/src/QueueConnectionRequest.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include "QueueConnectionRequest.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/DataInput.hpp> #include <gfcpp/DataOutput.hpp> using namespace apache::geode::client; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/QueueConnectionResponse.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/QueueConnectionResponse.cpp b/src/cppcache/src/QueueConnectionResponse.cpp index e9796c9..05badd4 100644 --- a/src/cppcache/src/QueueConnectionResponse.cpp +++ b/src/cppcache/src/QueueConnectionResponse.cpp @@ -16,7 +16,7 @@ */ #include "QueueConnectionResponse.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/DataInput.hpp> #include "ServerLocation.hpp" using namespace apache::geode::client; http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/RegionAttributes.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/RegionAttributes.cpp b/src/cppcache/src/RegionAttributes.cpp index cbb39e4..28dc35e 100644 --- a/src/cppcache/src/RegionAttributes.cpp +++ b/src/cppcache/src/RegionAttributes.cpp @@ -20,7 +20,7 @@ #include <gfcpp/DataOutput.hpp> #include <string.h> #include <stdlib.h> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include <CacheXmlParser.hpp> #include <ace/DLL.h> #include <ace/OS.h> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/RemoteQuery.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/RemoteQuery.cpp b/src/cppcache/src/RemoteQuery.cpp index 701a094..346b37a 100644 --- a/src/cppcache/src/RemoteQuery.cpp +++ b/src/cppcache/src/RemoteQuery.cpp @@ -18,7 +18,7 @@ #include "TcrMessage.hpp" #include "ResultSetImpl.hpp" #include "StructSetImpl.hpp" -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include "ReadWriteLock.hpp" #include "ThinClientRegion.hpp" #include "UserAttributes.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/Serializable.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/Serializable.cpp b/src/cppcache/src/Serializable.cpp index a12da97..ac5acc9 100644 --- a/src/cppcache/src/Serializable.cpp +++ b/src/cppcache/src/Serializable.cpp @@ -16,7 +16,7 @@ */ #include <gfcpp/gfcpp_globals.hpp> #include <gfcpp/Serializable.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include <SerializationRegistry.hpp> #include <Utils.hpp> #include <gfcpp/CacheableString.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/SerializationRegistry.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/SerializationRegistry.cpp b/src/cppcache/src/SerializationRegistry.cpp index 34309a3..6cf632f 100644 --- a/src/cppcache/src/SerializationRegistry.cpp +++ b/src/cppcache/src/SerializationRegistry.cpp @@ -27,7 +27,7 @@ #include <gfcpp/Struct.hpp> #include <gfcpp/DataInput.hpp> #include <gfcpp/DataOutput.hpp> -#include <gfcpp/GemfireTypeIds.hpp> +#include <gfcpp/GeodeTypeIds.hpp> #include "CacheableToken.hpp" #include <gfcpp/Region.hpp> #include "EventId.hpp" @@ -104,7 +104,7 @@ class TheTypeMap : private NonCopyable, private NonAssignable { inline void setup() { // Register GemFire builtins here!! - // update type ids in GemfireTypeIds.hpp + // update type ids in GeodeTypeIds.hpp bind(CacheableByte::createDeserializable); bind(CacheableBoolean::createDeserializable); http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/SerializationRegistry.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/SerializationRegistry.hpp b/src/cppcache/src/SerializationRegistry.hpp index 7971807..bce9cef 100644 --- a/src/cppcache/src/SerializationRegistry.hpp +++ b/src/cppcache/src/SerializationRegistry.hpp @@ -25,8 +25,8 @@ #include <ace/Hash_Map_Manager.h> #include <ace/Thread_Mutex.h> #include <ace/Null_Mutex.h> -#include <gfcpp/GemfireTypeIds.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include <gfcpp/GeodeTypeIds.hpp> +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/DataOutput.hpp> #include <gfcpp/ExceptionTypes.hpp> #include <gfcpp/Delta.hpp> http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ServerLocation.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ServerLocation.hpp b/src/cppcache/src/ServerLocation.hpp index 4776e8b..4c621ad 100644 --- a/src/cppcache/src/ServerLocation.hpp +++ b/src/cppcache/src/ServerLocation.hpp @@ -22,7 +22,7 @@ #include "Utils.hpp" #include <gfcpp/DataOutput.hpp> #include <gfcpp/CacheableString.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <ace/INET_Addr.h> #include <gfcpp/CacheableBuiltins.hpp> namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ServerLocationRequest.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ServerLocationRequest.cpp b/src/cppcache/src/ServerLocationRequest.cpp index 6baac60..23257d3 100644 --- a/src/cppcache/src/ServerLocationRequest.cpp +++ b/src/cppcache/src/ServerLocationRequest.cpp @@ -16,7 +16,7 @@ */ #include "ServerLocationRequest.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" using namespace apache::geode::client; /*int8_t ServerLocationRequest::typeId( ) const { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ServerLocationResponse.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ServerLocationResponse.hpp b/src/cppcache/src/ServerLocationResponse.hpp index 2b4662d..0a7e685 100644 --- a/src/cppcache/src/ServerLocationResponse.hpp +++ b/src/cppcache/src/ServerLocationResponse.hpp @@ -17,7 +17,7 @@ #ifndef __SERVER_LOCATION__RESPONSE__ #define __SERVER_LOCATION__RESPONSE__ #include <gfcpp/Serializable.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" namespace apache { namespace geode { namespace client { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/Struct.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/Struct.cpp b/src/cppcache/src/Struct.cpp index 1e7ae90..041059b 100644 --- a/src/cppcache/src/Struct.cpp +++ b/src/cppcache/src/Struct.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ #include <gfcpp/Struct.hpp> -#include <GemfireTypeIdsImpl.hpp> +#include <GeodeTypeIdsImpl.hpp> #include <gfcpp/DataInput.hpp> namespace apache { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/TcrConnection.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TcrConnection.cpp b/src/cppcache/src/TcrConnection.cpp index f80aa7e..a94e6dc 100644 --- a/src/cppcache/src/TcrConnection.cpp +++ b/src/cppcache/src/TcrConnection.cpp @@ -26,7 +26,7 @@ #include <ace/OS.h> #include "TcrEndpoint.hpp" -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "TcrConnectionManager.hpp" #include "DistributedSystemImpl.hpp" #include "Version.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/TcrMessage.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TcrMessage.hpp b/src/cppcache/src/TcrMessage.hpp index ca29f43..cf1cd56 100644 --- a/src/cppcache/src/TcrMessage.hpp +++ b/src/cppcache/src/TcrMessage.hpp @@ -32,7 +32,7 @@ #include <gfcpp/CacheableBuiltins.hpp> #include "TcrChunkedContext.hpp" #include <gfcpp/VectorT.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "BucketServerLocation.hpp" #include "FixedPartitionAttributesImpl.hpp" #include "VersionTag.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/ThinClientRegion.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientRegion.cpp b/src/cppcache/src/ThinClientRegion.cpp index feb694f..c84b68c 100644 --- a/src/cppcache/src/ThinClientRegion.cpp +++ b/src/cppcache/src/ThinClientRegion.cpp @@ -28,7 +28,7 @@ #include "RemoteQuery.hpp" #include <gfcpp/SelectResultsIterator.hpp> #include <gfcpp/Struct.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "AutoDelete.hpp" #include <gfcpp/PoolManager.hpp> #include "UserAttributes.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/VersionTag.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/VersionTag.hpp b/src/cppcache/src/VersionTag.hpp index 29ec913..f3d92d7 100644 --- a/src/cppcache/src/VersionTag.hpp +++ b/src/cppcache/src/VersionTag.hpp @@ -18,7 +18,7 @@ #define __VERSIONTAG_HPP__ #include <gfcpp/Cacheable.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include "MemberListForVersionStamp.hpp" namespace apache { namespace geode { http://git-wip-us.apache.org/repos/asf/geode/blob/75000112/src/cppcache/src/VersionedCacheableObjectPartList.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/VersionedCacheableObjectPartList.cpp b/src/cppcache/src/VersionedCacheableObjectPartList.cpp index 8d5e4d6..56a504a 100644 --- a/src/cppcache/src/VersionedCacheableObjectPartList.cpp +++ b/src/cppcache/src/VersionedCacheableObjectPartList.cpp @@ -16,7 +16,7 @@ */ #include "VersionedCacheableObjectPartList.hpp" #include <gfcpp/ExceptionTypes.hpp> -#include "GemfireTypeIdsImpl.hpp" +#include "GeodeTypeIdsImpl.hpp" #include <gfcpp/CacheableString.hpp> #include "ThinClientRegion.hpp" #include "CacheableToken.hpp"
