Repository: geode Updated Branches: refs/heads/next-gen-native-client-software-grant e92cb631c -> 733d9a1cf
http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp b/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp index 25cf8a0..67d136e 100644 --- a/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp +++ b/src/tests/cpp/testobject/DeltaFastAssetAccount.cpp @@ -16,7 +16,7 @@ */ #include "DeltaFastAssetAccount.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; using namespace testobject; @@ -42,7 +42,8 @@ DeltaFastAssetAccount::DeltaFastAssetAccount(int index, bool encodeTimestp, getBeforeUpdate = getbfrUpdate; } -void DeltaFastAssetAccount::toData(gemfire::DataOutput& output) const { +void DeltaFastAssetAccount::toData( + apache::geode::client::DataOutput& output) const { output.writeInt(static_cast<int32_t>(acctId)); output.writeObject(customerName); output.writeDouble(netWorth); @@ -50,8 +51,8 @@ void DeltaFastAssetAccount::toData(gemfire::DataOutput& output) const { output.writeInt(static_cast<int64_t>(timestamp)); } -gemfire::Serializable* DeltaFastAssetAccount::fromData( - gemfire::DataInput& input) { +apache::geode::client::Serializable* DeltaFastAssetAccount::fromData( + apache::geode::client::DataInput& input) { input.readInt(&acctId); input.readObject(customerName); input.readDouble(&netWorth); @@ -60,13 +61,14 @@ gemfire::Serializable* DeltaFastAssetAccount::fromData( return this; } -void DeltaFastAssetAccount::toDelta(gemfire::DataOutput& output) const { +void DeltaFastAssetAccount::toDelta( + apache::geode::client::DataOutput& output) const { output.writeDouble(netWorth); if (encodeTimestamp) { output.writeInt(static_cast<int64_t>(timestamp)); } } -void DeltaFastAssetAccount::fromDelta(gemfire::DataInput& input) { +void DeltaFastAssetAccount::fromDelta(apache::geode::client::DataInput& input) { if (getBeforeUpdate) { input.readDouble(&netWorth); } else { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp index d3b2f9e..7ac2e48 100644 --- a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp +++ b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp @@ -40,11 +40,12 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class DeltaFastAssetAccount; -typedef gemfire::SharedPtr<DeltaFastAssetAccount> DeltaFastAssetAccountPtr; +typedef apache::geode::client::SharedPtr<DeltaFastAssetAccount> + DeltaFastAssetAccountPtr; class TESTOBJECT_EXPORT DeltaFastAssetAccount : public Cacheable, public Delta { private: bool encodeTimestamp; @@ -72,10 +73,11 @@ class TESTOBJECT_EXPORT DeltaFastAssetAccount : public Cacheable, public Delta { int asstSize = 0, bool getbfrUpdate = false); virtual ~DeltaFastAssetAccount() {} - void toData(gemfire::DataOutput& output) const; - gemfire::Serializable* fromData(gemfire::DataInput& input); - void toDelta(gemfire::DataOutput& output) const; - void fromDelta(gemfire::DataInput& input); + void toData(apache::geode::client::DataOutput& output) const; + apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); + void toDelta(apache::geode::client::DataOutput& output) const; + void fromDelta(apache::geode::client::DataInput& input); CacheableStringPtr toString() const { char buf[102500]; @@ -141,7 +143,7 @@ class TESTOBJECT_EXPORT DeltaFastAssetAccount : public Cacheable, public Delta { return clonePtr; } - static gemfire::Serializable* createDeserializable() { + static apache::geode::client::Serializable* createDeserializable() { return new DeltaFastAssetAccount(); } }; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/DeltaPSTObject.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/DeltaPSTObject.cpp b/src/tests/cpp/testobject/DeltaPSTObject.cpp index febe16d..2b4b42a 100644 --- a/src/tests/cpp/testobject/DeltaPSTObject.cpp +++ b/src/tests/cpp/testobject/DeltaPSTObject.cpp @@ -18,7 +18,7 @@ #include "ArrayOfByte.hpp" #include "DeltaPSTObject.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; using namespace testobject; @@ -45,14 +45,15 @@ void DeltaPSTObject::toDelta(DataOutput& output) const { output.writeInt(static_cast<int32_t>(field1)); output.writeInt(static_cast<int64_t>(timestamp)); } -void DeltaPSTObject::toData(gemfire::DataOutput& output) const { +void DeltaPSTObject::toData(apache::geode::client::DataOutput& output) const { output.writeInt(static_cast<int64_t>(timestamp)); output.writeInt(static_cast<int32_t>(field1)); output.write(field2); output.writeObject(valueData); } -gemfire::Serializable* DeltaPSTObject::fromData(gemfire::DataInput& input) { +apache::geode::client::Serializable* DeltaPSTObject::fromData( + apache::geode::client::DataInput& input) { input.readInt(reinterpret_cast<int64_t*>(×tamp)); input.readInt(&field1); input.read(&field2); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/DeltaPSTObject.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/DeltaPSTObject.hpp b/src/tests/cpp/testobject/DeltaPSTObject.hpp index 1016863..e7894d4 100644 --- a/src/tests/cpp/testobject/DeltaPSTObject.hpp +++ b/src/tests/cpp/testobject/DeltaPSTObject.hpp @@ -42,7 +42,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class TESTOBJECT_EXPORT DeltaPSTObject : public Cacheable, public Delta { @@ -56,8 +56,9 @@ class TESTOBJECT_EXPORT DeltaPSTObject : public Cacheable, public Delta { DeltaPSTObject() : timestamp(0), valueData(NULLPTR) {} DeltaPSTObject(int size, bool encodeKey, bool encodeTimestamp); virtual ~DeltaPSTObject() {} - void toData(gemfire::DataOutput& output) const; - gemfire::Serializable* fromData(gemfire::DataInput& input); + void toData(apache::geode::client::DataOutput& output) const; + apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); void fromDelta(DataInput& input); void toDelta(DataOutput& output) const; CacheableStringPtr toString() const; @@ -89,6 +90,6 @@ class TESTOBJECT_EXPORT DeltaPSTObject : public Cacheable, public Delta { static Serializable* createDeserializable() { return new DeltaPSTObject(); } }; -typedef gemfire::SharedPtr<DeltaPSTObject> DeltaPSTObjectPtr; +typedef apache::geode::client::SharedPtr<DeltaPSTObject> DeltaPSTObjectPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/DeltaTestImpl.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/DeltaTestImpl.hpp b/src/tests/cpp/testobject/DeltaTestImpl.hpp index 3737e61..1f2b4a5 100644 --- a/src/tests/cpp/testobject/DeltaTestImpl.hpp +++ b/src/tests/cpp/testobject/DeltaTestImpl.hpp @@ -42,7 +42,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { class DeltaTestImpl; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/DeltaTestObj.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/DeltaTestObj.hpp b/src/tests/cpp/testobject/DeltaTestObj.hpp index c66158c..56da56f 100644 --- a/src/tests/cpp/testobject/DeltaTestObj.hpp +++ b/src/tests/cpp/testobject/DeltaTestObj.hpp @@ -30,7 +30,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class TESTOBJECT_EXPORT DeltaTestObj : public DeltaTestImpl { @@ -92,6 +92,6 @@ class TESTOBJECT_EXPORT DeltaTestObj : public DeltaTestImpl { } }; -typedef gemfire::SharedPtr<DeltaTestObj> DeltaTestObjPtr; +typedef apache::geode::client::SharedPtr<DeltaTestObj> DeltaTestObjPtr; } #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/EqStruct.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/EqStruct.cpp b/src/tests/cpp/testobject/EqStruct.cpp index 87319f5..559aef9 100644 --- a/src/tests/cpp/testobject/EqStruct.cpp +++ b/src/tests/cpp/testobject/EqStruct.cpp @@ -16,7 +16,7 @@ */ #include "EqStruct.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; using namespace testobject; @@ -79,7 +79,7 @@ EqStruct::EqStruct(int index) { } EqStruct::~EqStruct() {} -void EqStruct::toData(gemfire::DataOutput &out) const { +void EqStruct::toData(apache::geode::client::DataOutput &out) const { // Strings out.writeUTF(state); out.writeUTF(demandInd); @@ -139,7 +139,8 @@ void EqStruct::toData(gemfire::DataOutput &out) const { out.writeDouble(discretionOffset); } -gemfire::Serializable *EqStruct::fromData(gemfire::DataInput &in) { +apache::geode::client::Serializable *EqStruct::fromData( + apache::geode::client::DataInput &in) { // Strings in.readUTF(&state); in.readUTF(&demandInd); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/EqStruct.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/EqStruct.hpp b/src/tests/cpp/testobject/EqStruct.hpp index 26e1bd9..73033e5 100644 --- a/src/tests/cpp/testobject/EqStruct.hpp +++ b/src/tests/cpp/testobject/EqStruct.hpp @@ -41,7 +41,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class TESTOBJECT_EXPORT EqStruct : public TimestampedObject { @@ -105,8 +105,9 @@ class TESTOBJECT_EXPORT EqStruct : public TimestampedObject { EqStruct() {} EqStruct(int index); virtual ~EqStruct(); - virtual void toData(gemfire::DataOutput& output) const; - virtual gemfire::Serializable* fromData(gemfire::DataInput& input); + virtual void toData(apache::geode::client::DataOutput& output) const; + virtual apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); virtual int32_t classId() const { return 101; } CacheableStringPtr toString() const; @@ -141,11 +142,11 @@ class TESTOBJECT_EXPORT EqStruct : public TimestampedObject { timestamp = tusec * 1000; } - static gemfire::Serializable* createDeserializable() { + static apache::geode::client::Serializable* createDeserializable() { return new EqStruct(); } }; -typedef gemfire::SharedPtr<EqStruct> EqStructPtr; +typedef apache::geode::client::SharedPtr<EqStruct> EqStructPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/FastAsset.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/FastAsset.cpp b/src/tests/cpp/testobject/FastAsset.cpp index e95271e..dbe1b34 100644 --- a/src/tests/cpp/testobject/FastAsset.cpp +++ b/src/tests/cpp/testobject/FastAsset.cpp @@ -17,7 +17,7 @@ #include "FastAsset.hpp" #include "fwklib/GsRandom.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; using namespace testobject; @@ -26,12 +26,13 @@ FastAsset::FastAsset(int idx, int maxVal) : assetId(idx) { } FastAsset::~FastAsset() {} -void FastAsset::toData(gemfire::DataOutput& output) const { +void FastAsset::toData(apache::geode::client::DataOutput& output) const { output.writeInt(static_cast<int32_t>(assetId)); output.writeDouble(value); } -gemfire::Serializable* FastAsset::fromData(gemfire::DataInput& input) { +apache::geode::client::Serializable* FastAsset::fromData( + apache::geode::client::DataInput& input) { input.readInt(&assetId); input.readDouble(&value); return this; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/FastAsset.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/FastAsset.hpp b/src/tests/cpp/testobject/FastAsset.hpp index 455602a..e2732bb 100644 --- a/src/tests/cpp/testobject/FastAsset.hpp +++ b/src/tests/cpp/testobject/FastAsset.hpp @@ -41,11 +41,11 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class FastAsset; -typedef gemfire::SharedPtr<FastAsset> FastAssetPtr; +typedef apache::geode::client::SharedPtr<FastAsset> FastAssetPtr; class TESTOBJECT_EXPORT FastAsset : public TimestampedObject { private: @@ -60,8 +60,9 @@ class TESTOBJECT_EXPORT FastAsset : public TimestampedObject { FastAsset() : assetId(0), value(0) {} FastAsset(int size, int maxVal); virtual ~FastAsset(); - virtual void toData(gemfire::DataOutput& output) const; - virtual gemfire::Serializable* fromData(gemfire::DataInput& input); + virtual void toData(apache::geode::client::DataOutput& output) const; + virtual apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); virtual int32_t classId() const { return 24; } virtual uint32_t objectSize() const { @@ -105,11 +106,11 @@ class TESTOBJECT_EXPORT FastAsset : public TimestampedObject { return CacheableString::create(buf); } - static gemfire::Serializable* createDeserializable() { + static apache::geode::client::Serializable* createDeserializable() { return new FastAsset(); } }; -// typedef gemfire::SharedPtr<FastAsset> FastAssetPtr; +// typedef apache::geode::client::SharedPtr<FastAsset> FastAssetPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/FastAssetAccount.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/FastAssetAccount.cpp b/src/tests/cpp/testobject/FastAssetAccount.cpp index b4878e0..8d1040e 100644 --- a/src/tests/cpp/testobject/FastAssetAccount.cpp +++ b/src/tests/cpp/testobject/FastAssetAccount.cpp @@ -17,7 +17,7 @@ #include "FastAssetAccount.hpp" #include "FastAsset.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; using namespace testobject; @@ -44,7 +44,7 @@ FastAssetAccount::FastAssetAccount(int idx, bool encodeTimestp, int maxVal, } FastAssetAccount::~FastAssetAccount() {} -void FastAssetAccount::toData(gemfire::DataOutput& output) const { +void FastAssetAccount::toData(apache::geode::client::DataOutput& output) const { // output.writeBoolean(encodeTimestamp); output.writeInt(static_cast<int32_t>(acctId)); output.writeObject(customerName); @@ -53,7 +53,8 @@ void FastAssetAccount::toData(gemfire::DataOutput& output) const { output.writeInt(static_cast<int64_t>(timestamp)); } -gemfire::Serializable* FastAssetAccount::fromData(gemfire::DataInput& input) { +apache::geode::client::Serializable* FastAssetAccount::fromData( + apache::geode::client::DataInput& input) { // input.readBoolean(&encodeTimestamp); input.readInt(&acctId); input.readObject(customerName); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/FastAssetAccount.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/FastAssetAccount.hpp b/src/tests/cpp/testobject/FastAssetAccount.hpp index 940cb43..800c6ff 100644 --- a/src/tests/cpp/testobject/FastAssetAccount.hpp +++ b/src/tests/cpp/testobject/FastAssetAccount.hpp @@ -41,7 +41,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class TESTOBJECT_EXPORT FastAssetAccount : public TimestampedObject { @@ -67,8 +67,9 @@ class TESTOBJECT_EXPORT FastAssetAccount : public TimestampedObject { timestamp(0) {} FastAssetAccount(int index, bool encodeTimestp, int maxVal, int asstSize = 0); virtual ~FastAssetAccount(); - virtual void toData(gemfire::DataOutput& output) const; - virtual gemfire::Serializable* fromData(gemfire::DataInput& input); + virtual void toData(apache::geode::client::DataOutput& output) const; + virtual apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); virtual int32_t classId() const { return 23; } CacheableStringPtr toString() const; @@ -112,11 +113,11 @@ class TESTOBJECT_EXPORT FastAssetAccount : public TimestampedObject { resetTimestamp(); } } - static gemfire::Serializable* createDeserializable() { + static apache::geode::client::Serializable* createDeserializable() { return new FastAssetAccount(); } }; -typedef gemfire::SharedPtr<FastAssetAccount> FastAssetAccountPtr; +typedef apache::geode::client::SharedPtr<FastAssetAccount> FastAssetAccountPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/InvalidPdxUsage.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/InvalidPdxUsage.cpp b/src/tests/cpp/testobject/InvalidPdxUsage.cpp index ee232fc..a8e4a84 100644 --- a/src/tests/cpp/testobject/InvalidPdxUsage.cpp +++ b/src/tests/cpp/testobject/InvalidPdxUsage.cpp @@ -24,7 +24,7 @@ #include "InvalidPdxUsage.hpp" //#include "../cppcache/fw_dunit.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; template <typename T1, typename T2> http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/InvalidPdxUsage.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/InvalidPdxUsage.hpp b/src/tests/cpp/testobject/InvalidPdxUsage.hpp index f43bf49..3286cc0 100644 --- a/src/tests/cpp/testobject/InvalidPdxUsage.hpp +++ b/src/tests/cpp/testobject/InvalidPdxUsage.hpp @@ -39,7 +39,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { @@ -112,7 +112,7 @@ class TESTOBJECT_EXPORT CharTypesWithInvalidUsage : public PdxSerializable { return false; } else { i++; -} + } } return true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/NestedPdxObject.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/NestedPdxObject.cpp b/src/tests/cpp/testobject/NestedPdxObject.cpp index fa64bc8..17a6356 100644 --- a/src/tests/cpp/testobject/NestedPdxObject.cpp +++ b/src/tests/cpp/testobject/NestedPdxObject.cpp @@ -21,7 +21,7 @@ #include "NestedPdxObject.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testobject; ChildPdx::~ChildPdx() {} http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/NestedPdxObject.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/NestedPdxObject.hpp b/src/tests/cpp/testobject/NestedPdxObject.hpp index f66503c..cd55788 100644 --- a/src/tests/cpp/testobject/NestedPdxObject.hpp +++ b/src/tests/cpp/testobject/NestedPdxObject.hpp @@ -37,7 +37,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { enum Gender { male, female, other }; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/NonPdxType.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/NonPdxType.cpp b/src/tests/cpp/testobject/NonPdxType.cpp index c86eeb8..ed124ab 100644 --- a/src/tests/cpp/testobject/NonPdxType.cpp +++ b/src/tests/cpp/testobject/NonPdxType.cpp @@ -23,7 +23,7 @@ #include "NonPdxType.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; template <typename T1, typename T2> http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/NonPdxType.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/NonPdxType.hpp b/src/tests/cpp/testobject/NonPdxType.hpp index 7b91451..3c8d49a 100644 --- a/src/tests/cpp/testobject/NonPdxType.hpp +++ b/src/tests/cpp/testobject/NonPdxType.hpp @@ -36,7 +36,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/NoopAuthInit.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/NoopAuthInit.cpp b/src/tests/cpp/testobject/NoopAuthInit.cpp index c73662a..b27d54f 100644 --- a/src/tests/cpp/testobject/NoopAuthInit.cpp +++ b/src/tests/cpp/testobject/NoopAuthInit.cpp @@ -20,7 +20,9 @@ #include "gfcpp/Log.hpp" #include "gfcpp/ExceptionTypes.hpp" -namespace gemfire { +namespace apache { +namespace geode { +namespace client { extern "C" { LIBEXP AuthInitialize* createNoopAuthInitInstance() { @@ -35,4 +37,6 @@ PropertiesPtr NoopAuthInit::getCredentials(PropertiesPtr& securityprops, PropertiesPtr credentials = Properties::create(); return credentials; } -} // namespace gemfire +} // namespace client +} // namespace geode +} // namespace apache http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/NoopAuthInit.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/NoopAuthInit.hpp b/src/tests/cpp/testobject/NoopAuthInit.hpp index 0d52194..ad7cacc 100644 --- a/src/tests/cpp/testobject/NoopAuthInit.hpp +++ b/src/tests/cpp/testobject/NoopAuthInit.hpp @@ -23,7 +23,9 @@ * @file */ -namespace gemfire { +namespace apache { +namespace geode { +namespace client { /** * @class NoopAuthInit Implementation NoopAuthInit.hpp @@ -77,5 +79,7 @@ class NoopAuthInit : public AuthInitialize { private: }; -} // namespace gemfire; +} // namespace client +} // namespace geode +} // namespace apache #endif //__NOOPAUTHINIT__ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PSTObject.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PSTObject.cpp b/src/tests/cpp/testobject/PSTObject.cpp index 26b75eb..76189c5 100644 --- a/src/tests/cpp/testobject/PSTObject.cpp +++ b/src/tests/cpp/testobject/PSTObject.cpp @@ -18,7 +18,7 @@ #include "fwklib/GsRandom.hpp" #include "ArrayOfByte.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; using namespace testobject; @@ -39,14 +39,15 @@ PSTObject::PSTObject(int size, bool encodeKey, bool encodeTimestamp) { } PSTObject::~PSTObject() {} -void PSTObject::toData(gemfire::DataOutput& output) const { +void PSTObject::toData(apache::geode::client::DataOutput& output) const { output.writeInt(static_cast<int64_t>(timestamp)); output.writeInt(static_cast<int32_t>(field1)); output.write(field2); output.writeObject(valueData); } -gemfire::Serializable* PSTObject::fromData(gemfire::DataInput& input) { +apache::geode::client::Serializable* PSTObject::fromData( + apache::geode::client::DataInput& input) { input.readInt(reinterpret_cast<int64_t*>(×tamp)); input.readInt(&field1); input.read(&field2); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PSTObject.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PSTObject.hpp b/src/tests/cpp/testobject/PSTObject.hpp index abfb742..53cca9c 100644 --- a/src/tests/cpp/testobject/PSTObject.hpp +++ b/src/tests/cpp/testobject/PSTObject.hpp @@ -41,7 +41,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { class TESTOBJECT_EXPORT PSTObject : public TimestampedObject { @@ -59,8 +59,9 @@ class TESTOBJECT_EXPORT PSTObject : public TimestampedObject { PSTObject() : timestamp(0), valueData(NULLPTR) {} PSTObject(int size, bool encodeKey, bool encodeTimestamp); virtual ~PSTObject(); - virtual void toData(gemfire::DataOutput& output) const; - virtual gemfire::Serializable* fromData(gemfire::DataInput& input); + virtual void toData(apache::geode::client::DataOutput& output) const; + virtual apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); virtual int32_t classId() const { return 0x04; } CacheableStringPtr toString() const; @@ -79,11 +80,11 @@ class TESTOBJECT_EXPORT PSTObject : public TimestampedObject { timestamp = tusec * 1000; } - static gemfire::Serializable* createDeserializable() { + static apache::geode::client::Serializable* createDeserializable() { return new PSTObject(); } }; -typedef gemfire::SharedPtr<PSTObject> PSTObjectPtr; +typedef apache::geode::client::SharedPtr<PSTObject> PSTObjectPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxAutoMegaType.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxAutoMegaType.cpp b/src/tests/cpp/testobject/PdxAutoMegaType.cpp index 121736b..2a40f72 100644 --- a/src/tests/cpp/testobject/PdxAutoMegaType.cpp +++ b/src/tests/cpp/testobject/PdxAutoMegaType.cpp @@ -16,7 +16,7 @@ */ #include "PdxAutoMegaType.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxAutoTests; // CTOR http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxAutoMegaType.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxAutoMegaType.hpp b/src/tests/cpp/testobject/PdxAutoMegaType.hpp index 4c6cdbe..f5c61c3 100644 --- a/src/tests/cpp/testobject/PdxAutoMegaType.hpp +++ b/src/tests/cpp/testobject/PdxAutoMegaType.hpp @@ -32,7 +32,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; #define GFIGNORE(X) X #define GFID http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV1.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV1.cpp b/src/tests/cpp/testobject/PdxClassV1.cpp index a2b5c26..b4a7163 100644 --- a/src/tests/cpp/testobject/PdxClassV1.cpp +++ b/src/tests/cpp/testobject/PdxClassV1.cpp @@ -23,7 +23,7 @@ #include "PdxClassV1.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; /************************************************************ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV1.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV1.hpp b/src/tests/cpp/testobject/PdxClassV1.hpp index fc3e6f5..a4c62ea 100644 --- a/src/tests/cpp/testobject/PdxClassV1.hpp +++ b/src/tests/cpp/testobject/PdxClassV1.hpp @@ -38,7 +38,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp b/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp index 6630db3..9a1fe55 100644 --- a/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp +++ b/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp @@ -16,7 +16,7 @@ */ #include "PdxClassV1WithAuto.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTestsAuto; /************************************************************ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp b/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp index e0fe36b..0890e2d 100644 --- a/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp +++ b/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp @@ -32,7 +32,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; #define GFIGNORE(X) X #define GFID http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV2.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV2.cpp b/src/tests/cpp/testobject/PdxClassV2.cpp index 9b4d647..7e12986 100644 --- a/src/tests/cpp/testobject/PdxClassV2.cpp +++ b/src/tests/cpp/testobject/PdxClassV2.cpp @@ -23,7 +23,7 @@ #include "PdxClassV2.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; /************************************************************ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV2.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV2.hpp b/src/tests/cpp/testobject/PdxClassV2.hpp index 6213283..4fefadd 100644 --- a/src/tests/cpp/testobject/PdxClassV2.hpp +++ b/src/tests/cpp/testobject/PdxClassV2.hpp @@ -38,7 +38,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp b/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp index e80ebfc..60548c2 100644 --- a/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp +++ b/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp @@ -17,7 +17,7 @@ #include "PdxClassV2WithAuto.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTestsAuto; /************************************************************ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp b/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp index 0a76e30..ec10f21 100644 --- a/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp +++ b/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp @@ -32,7 +32,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; #define GFIGNORE(X) X #define GFID http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxType.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxType.cpp b/src/tests/cpp/testobject/PdxType.cpp index c5e2e40..b284e2f 100644 --- a/src/tests/cpp/testobject/PdxType.cpp +++ b/src/tests/cpp/testobject/PdxType.cpp @@ -23,7 +23,7 @@ #include "PdxType.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; template <typename T1, typename T2> http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxType.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxType.hpp b/src/tests/cpp/testobject/PdxType.hpp index d470527..a3fa36d 100644 --- a/src/tests/cpp/testobject/PdxType.hpp +++ b/src/tests/cpp/testobject/PdxType.hpp @@ -39,7 +39,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { @@ -139,7 +139,7 @@ class TESTOBJECT_EXPORT Child : public Parent, public PdxSerializable { if (m_a == pap->m_a && m_b == pap->m_b && m_c == pap->m_c && m_d == pap->m_d && m_e == pap->m_e && m_f == pap->m_f) { return true; -} + } return false; } @@ -213,7 +213,7 @@ class TESTOBJECT_EXPORT CharTypes : public PdxSerializable { return false; } else { i++; -} + } } return true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxTypeWithAuto.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxTypeWithAuto.cpp b/src/tests/cpp/testobject/PdxTypeWithAuto.cpp index 11fd8cb..6990ea2 100644 --- a/src/tests/cpp/testobject/PdxTypeWithAuto.cpp +++ b/src/tests/cpp/testobject/PdxTypeWithAuto.cpp @@ -16,7 +16,7 @@ */ #include "PdxTypeWithAuto.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTestsAuto; template <typename T1, typename T2> http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxTypeWithAuto.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxTypeWithAuto.hpp b/src/tests/cpp/testobject/PdxTypeWithAuto.hpp index 681ec70..ea4f34c 100644 --- a/src/tests/cpp/testobject/PdxTypeWithAuto.hpp +++ b/src/tests/cpp/testobject/PdxTypeWithAuto.hpp @@ -32,7 +32,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; #define GFIGNORE(X) X #define GFID @@ -144,7 +144,7 @@ class GFIGNORE(TESTOBJECT_EXPORT) Child : public Parent, if (m_a == pap->m_a && m_b == pap->m_b && m_c == pap->m_c && m_d == pap->m_d && m_e == pap->m_e && m_f == pap->m_f) { return true; -} + } return false; } @@ -218,7 +218,7 @@ class GFIGNORE(TESTOBJECT_EXPORT) CharTypes : public PdxSerializable { return false; } else { i++; -} + } } return true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxVersioned1.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxVersioned1.cpp b/src/tests/cpp/testobject/PdxVersioned1.cpp index 2291dfe..f5bb477 100644 --- a/src/tests/cpp/testobject/PdxVersioned1.cpp +++ b/src/tests/cpp/testobject/PdxVersioned1.cpp @@ -23,7 +23,7 @@ #include "PdxVersioned1.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; template <typename T1, typename T2> http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxVersioned1.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxVersioned1.hpp b/src/tests/cpp/testobject/PdxVersioned1.hpp index 1d0bf91..14ad854 100644 --- a/src/tests/cpp/testobject/PdxVersioned1.hpp +++ b/src/tests/cpp/testobject/PdxVersioned1.hpp @@ -40,7 +40,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxVersioned2.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxVersioned2.cpp b/src/tests/cpp/testobject/PdxVersioned2.cpp index edcb0c1..749daf3 100644 --- a/src/tests/cpp/testobject/PdxVersioned2.cpp +++ b/src/tests/cpp/testobject/PdxVersioned2.cpp @@ -23,7 +23,7 @@ #include "PdxVersioned2.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace PdxTests; // TEST_EXPORT Serializable * createPdxVersioned2(const char* key) { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PdxVersioned2.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PdxVersioned2.hpp b/src/tests/cpp/testobject/PdxVersioned2.hpp index 07b9bb9..7c53a7c 100644 --- a/src/tests/cpp/testobject/PdxVersioned2.hpp +++ b/src/tests/cpp/testobject/PdxVersioned2.hpp @@ -40,7 +40,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/Portfolio.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/Portfolio.cpp b/src/tests/cpp/testobject/Portfolio.cpp index 3b3f40d..7deedf1 100644 --- a/src/tests/cpp/testobject/Portfolio.cpp +++ b/src/tests/cpp/testobject/Portfolio.cpp @@ -16,7 +16,7 @@ */ #include "Portfolio.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testobject; const char* Portfolio::secIds[] = {"SUN", "IBM", "YHOO", "GOOG", "MSFT", http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/Portfolio.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/Portfolio.hpp b/src/tests/cpp/testobject/Portfolio.hpp index 73e6c3c..ca675ad 100644 --- a/src/tests/cpp/testobject/Portfolio.hpp +++ b/src/tests/cpp/testobject/Portfolio.hpp @@ -25,7 +25,7 @@ #include <gfcpp/GemfireCppCache.hpp> #include "Position.hpp" -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { @@ -72,7 +72,8 @@ class TESTOBJECT_EXPORT Portfolio : public Serializable { objectSize += getObjectSize(positions); objectSize += getObjectSize(type); objectSize += - (status == NULL ? 0 : sizeof(char) * static_cast<uint32_t>(strlen(status))); + (status == NULL ? 0 + : sizeof(char) * static_cast<uint32_t>(strlen(status))); objectSize += getObjectSize(names); objectSize += sizeof(uint8_t) * newValSize; objectSize += getObjectSize(creationDate); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PortfolioPdx.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PortfolioPdx.cpp b/src/tests/cpp/testobject/PortfolioPdx.cpp index dca95d9..923d998 100644 --- a/src/tests/cpp/testobject/PortfolioPdx.cpp +++ b/src/tests/cpp/testobject/PortfolioPdx.cpp @@ -16,7 +16,7 @@ */ #include "PortfolioPdx.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace testobject; const char* PortfolioPdx::secIds[] = {"SUN", "IBM", "YHOO", "GOOG", "MSFT", http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PortfolioPdx.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PortfolioPdx.hpp b/src/tests/cpp/testobject/PortfolioPdx.hpp index 34e5830..8020763 100644 --- a/src/tests/cpp/testobject/PortfolioPdx.hpp +++ b/src/tests/cpp/testobject/PortfolioPdx.hpp @@ -24,7 +24,7 @@ #include "PositionPdx.hpp" -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/Position.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/Position.cpp b/src/tests/cpp/testobject/Position.cpp index bd66fa9..374499f 100644 --- a/src/tests/cpp/testobject/Position.cpp +++ b/src/tests/cpp/testobject/Position.cpp @@ -18,7 +18,7 @@ #include <cwchar> #include <wchar.h> -using namespace gemfire; +using namespace apache::geode::client; using namespace testobject; int32_t Position::cnt = 0; @@ -80,7 +80,7 @@ void Position::init() { pid = 0; } -void Position::toData(gemfire::DataOutput& output) const { +void Position::toData(apache::geode::client::DataOutput& output) const { output.writeInt(avg20DaysVol); output.writeObject(bondRating); output.writeDouble(convRatio); @@ -99,7 +99,8 @@ void Position::toData(gemfire::DataOutput& output) const { output.writeInt(pid); } -gemfire::Serializable* Position::fromData(gemfire::DataInput& input) { +apache::geode::client::Serializable* Position::fromData( + apache::geode::client::DataInput& input) { input.readInt(&avg20DaysVol); input.readObject(bondRating); input.readDouble(&convRatio); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/Position.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/Position.hpp b/src/tests/cpp/testobject/Position.hpp index 305bf22..e471f43 100644 --- a/src/tests/cpp/testobject/Position.hpp +++ b/src/tests/cpp/testobject/Position.hpp @@ -35,11 +35,11 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { -class TESTOBJECT_EXPORT Position : public gemfire::Serializable { +class TESTOBJECT_EXPORT Position : public apache::geode::client::Serializable { private: int64_t avg20DaysVol; CacheableStringPtr bondRating; @@ -71,8 +71,9 @@ class TESTOBJECT_EXPORT Position : public gemfire::Serializable { // This constructor is just for some internal data validation test Position(int32_t iForExactVal); virtual ~Position(); - virtual void toData(gemfire::DataOutput& output) const; - virtual gemfire::Serializable* fromData(gemfire::DataInput& input); + virtual void toData(apache::geode::client::DataOutput& output) const; + virtual apache::geode::client::Serializable* fromData( + apache::geode::client::DataInput& input); virtual int32_t classId() const { return 0x02; } CacheableStringPtr toString() const; @@ -94,7 +95,7 @@ class TESTOBJECT_EXPORT Position : public gemfire::Serializable { CacheableStringPtr getSecId() { return secId; } int32_t getId() { return pid; } int32_t getSharesOutstanding() { return sharesOutstanding; } - static gemfire::Serializable* createDeserializable() { + static apache::geode::client::Serializable* createDeserializable() { return new Position(); } @@ -102,6 +103,6 @@ class TESTOBJECT_EXPORT Position : public gemfire::Serializable { void init(); }; -typedef gemfire::SharedPtr<Position> PositionPtr; +typedef apache::geode::client::SharedPtr<Position> PositionPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PositionPdx.cpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PositionPdx.cpp b/src/tests/cpp/testobject/PositionPdx.cpp index 0719728..e69a11c 100644 --- a/src/tests/cpp/testobject/PositionPdx.cpp +++ b/src/tests/cpp/testobject/PositionPdx.cpp @@ -18,7 +18,7 @@ #include <cwchar> #include <wchar.h> -using namespace gemfire; +using namespace apache::geode::client; using namespace testobject; int32_t PositionPdx::cnt = 0; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/PositionPdx.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/PositionPdx.hpp b/src/tests/cpp/testobject/PositionPdx.hpp index 7774c22..6f12927 100644 --- a/src/tests/cpp/testobject/PositionPdx.hpp +++ b/src/tests/cpp/testobject/PositionPdx.hpp @@ -38,11 +38,12 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { -class TESTOBJECT_EXPORT PositionPdx : public gemfire::PdxSerializable { +class TESTOBJECT_EXPORT PositionPdx + : public apache::geode::client::PdxSerializable { private: int64_t avg20DaysVol; char* bondRating; @@ -98,6 +99,6 @@ class TESTOBJECT_EXPORT PositionPdx : public gemfire::PdxSerializable { void init(); }; -typedef gemfire::SharedPtr<PositionPdx> PositionPdxPtr; +typedef apache::geode::client::SharedPtr<PositionPdx> PositionPdxPtr; } // namespace testobject #endif http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/TestObject1.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/TestObject1.hpp b/src/tests/cpp/testobject/TestObject1.hpp index ca9fd83..0a30075 100644 --- a/src/tests/cpp/testobject/TestObject1.hpp +++ b/src/tests/cpp/testobject/TestObject1.hpp @@ -37,7 +37,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace testobject { class TESTOBJECT_EXPORT TestObject1 : public Cacheable { private: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/TimestampedObject.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/TimestampedObject.hpp b/src/tests/cpp/testobject/TimestampedObject.hpp index 5137e0e..0be7ae2 100644 --- a/src/tests/cpp/testobject/TimestampedObject.hpp +++ b/src/tests/cpp/testobject/TimestampedObject.hpp @@ -29,21 +29,25 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testframework; namespace testobject { -class TESTOBJECT_EXPORT TimestampedObject : public gemfire::Serializable { +class TESTOBJECT_EXPORT TimestampedObject + : public apache::geode::client::Serializable { public: virtual uint64_t getTimestamp() { return 0; } virtual void resetTimestamp() {} - virtual Serializable* fromData(gemfire::DataInput& input) { return this; } - virtual void toData(gemfire::DataOutput& output) const {} + virtual Serializable* fromData(apache::geode::client::DataInput& input) { + return this; + } + virtual void toData(apache::geode::client::DataOutput& output) const {} virtual int32_t classId() const { return 0; } virtual uint32_t objectSize() const { return 0; } virtual ~TimestampedObject() {} }; -typedef gemfire::SharedPtr<TimestampedObject> TimestampedObjectPtr; +typedef apache::geode::client::SharedPtr<TimestampedObject> + TimestampedObjectPtr; } // namespace testobject #endif // __TimestampedObjectHPP__ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/VariousPdxTypes.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/VariousPdxTypes.hpp b/src/tests/cpp/testobject/VariousPdxTypes.hpp index 618a03f..cda74be 100644 --- a/src/tests/cpp/testobject/VariousPdxTypes.hpp +++ b/src/tests/cpp/testobject/VariousPdxTypes.hpp @@ -39,7 +39,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; namespace PdxTests { /************************************************************ http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp ---------------------------------------------------------------------- diff --git a/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp b/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp index eda217c..51a423a 100644 --- a/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp +++ b/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp @@ -32,7 +32,7 @@ #define TESTOBJECT_EXPORT #endif -using namespace gemfire; +using namespace apache::geode::client; #define GFIGNORE(X) X #define GFID
