Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A9AD9200C2C for ; Mon, 23 Jan 2017 20:17:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A8781160B3C; Mon, 23 Jan 2017 19:17:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 59414160B76 for ; Mon, 23 Jan 2017 20:16:59 +0100 (CET) Received: (qmail 61763 invoked by uid 500); 23 Jan 2017 19:16:56 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 60148 invoked by uid 99); 23 Jan 2017 19:16:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2017 19:16:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01368DFCCC; Mon, 23 Jan 2017 19:16:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbarrett@apache.org To: commits@geode.apache.org Date: Mon, 23 Jan 2017 19:17:25 -0000 Message-Id: <2809419a56b346c0af7333709c23c9ea@git.apache.org> In-Reply-To: <3b70f23ce0d94fe8b80697526ed3768f@git.apache.org> References: <3b70f23ce0d94fe8b80697526ed3768f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] geode git commit: GEODE-2316: Removed namespace Apache.Geode.Client.Generic. archived-at: Mon, 23 Jan 2017 19:17:06 -0000 http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableString.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableString.cpp b/src/clicache/src/CacheableString.cpp index 97585c5..181be6d 100644 --- a/src/clicache/src/CacheableString.cpp +++ b/src/clicache/src/CacheableString.cpp @@ -32,8 +32,6 @@ namespace Apache { namespace Client { -namespace Generic - { void CacheableString::ToData(DataOutput^ output) { @@ -144,7 +142,7 @@ namespace Generic return (m_value->Length * sizeof(char)); } - bool CacheableString::Equals(Apache::Geode::Client::Generic::ICacheableKey^ other) + bool CacheableString::Equals(Apache::Geode::Client::ICacheableKey^ other) { if (other == nullptr || other->ClassId != ClassId) { return false; @@ -205,10 +203,10 @@ namespace Generic m_type = GemFireClassIds::CacheableStringHuge; else m_type = GemFireClassIds::CacheableString; - } - } - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableString.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableString.hpp b/src/clicache/src/CacheableString.hpp index 6b29c45..1641e7b 100644 --- a/src/clicache/src/CacheableString.hpp +++ b/src/clicache/src/CacheableString.hpp @@ -33,8 +33,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// An immutable string wrapper that can serve as a distributable /// key object for caching as well as being a string value. @@ -150,7 +149,7 @@ namespace Generic /// It invokes the '==' operator of the underlying /// apache::geode::client::CacheableString object. /// - virtual bool Equals(Apache::Geode::Client::Generic::ICacheableKey^ other) override; + virtual bool Equals(Apache::Geode::Client::ICacheableKey^ other) override; /// /// Return true if this key matches other object. @@ -317,8 +316,8 @@ namespace Generic inline CacheableString(apache::geode::client::Serializable* nativeptr) : CacheableKey(nativeptr) { } }; - } - } -} - } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableStringArray.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableStringArray.cpp b/src/clicache/src/CacheableStringArray.cpp index 2958ec5..0a860e4 100644 --- a/src/clicache/src/CacheableStringArray.cpp +++ b/src/clicache/src/CacheableStringArray.cpp @@ -30,8 +30,6 @@ namespace Apache { namespace Client { -namespace Generic - { CacheableStringArray::CacheableStringArray(array^ strings) : Serializable() @@ -90,10 +88,9 @@ namespace Generic } } return this; - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } } } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableStringArray.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableStringArray.hpp b/src/clicache/src/CacheableStringArray.hpp index 0a41cbe..e8fba28 100644 --- a/src/clicache/src/CacheableStringArray.hpp +++ b/src/clicache/src/CacheableStringArray.hpp @@ -33,8 +33,7 @@ namespace Apache { namespace Client { -namespace Generic - { + ref class CacheableString; /// @@ -184,8 +183,8 @@ namespace Generic inline CacheableStringArray(apache::geode::client::Serializable* nativeptr) : Serializable(nativeptr) { } }; - } - } -} - } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableUndefined.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableUndefined.cpp b/src/clicache/src/CacheableUndefined.cpp index 21f8892..4da32ce 100644 --- a/src/clicache/src/CacheableUndefined.cpp +++ b/src/clicache/src/CacheableUndefined.cpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + // Region: IGFSerializable Members void CacheableUndefined::ToData(DataOutput^ output) @@ -47,10 +46,8 @@ namespace Generic uint32_t CacheableUndefined::ObjectSize::get() { return static_cast (sizeof(CacheableUndefined^)); - } + } // namespace Client + } // namespace Geode +} // namespace Apache - // End Region: IGFSerializable Members - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableUndefined.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableUndefined.hpp b/src/clicache/src/CacheableUndefined.hpp index 131a5e0..ec414be 100644 --- a/src/clicache/src/CacheableUndefined.hpp +++ b/src/clicache/src/CacheableUndefined.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// Encapsulate an undefined result. /// @@ -104,7 +103,7 @@ namespace Generic return gcnew CacheableUndefined(); } }; - } - } -} - } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableVector.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableVector.cpp b/src/clicache/src/CacheableVector.cpp index 73de92d..b47f958 100644 --- a/src/clicache/src/CacheableVector.cpp +++ b/src/clicache/src/CacheableVector.cpp @@ -33,8 +33,7 @@ namespace Apache { namespace Client { -namespace Generic - { + // Region: IGFSerializable Members void CacheableVector::ToData(DataOutput^ output) @@ -71,11 +70,9 @@ namespace Generic } }*/ return m_arrayList->Count; - } + } // namespace Client + } // namespace Geode +} // namespace Apache - // End Region: IGFSerializable Members - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableVector.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CacheableVector.hpp b/src/clicache/src/CacheableVector.hpp index 9782535..666e3a8 100644 --- a/src/clicache/src/CacheableVector.hpp +++ b/src/clicache/src/CacheableVector.hpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// A mutable IGFSerializable vector wrapper that can serve as /// a distributable object for caching. This class extends .NET generic @@ -131,7 +130,7 @@ namespace Generic private: System::Collections::IList^ m_arrayList; }; - } - } -} - } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqAttributes.cpp b/src/clicache/src/CqAttributes.cpp index a386fcd..c6dbe10 100644 --- a/src/clicache/src/CqAttributes.cpp +++ b/src/clicache/src/CqAttributes.cpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic array^>^ CqAttributes::getCqListeners( ) { @@ -61,9 +60,8 @@ namespace Generic } } return listners; - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } - } } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqAttributes.hpp b/src/clicache/src/CqAttributes.hpp index 3c11fb0..dce5ab0 100644 --- a/src/clicache/src/CqAttributes.hpp +++ b/src/clicache/src/CqAttributes.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic interface class ICqListener; @@ -47,7 +46,7 @@ namespace Generic /// /// get all listeners in this attributes /// - virtual array^>^ getCqListeners(); + virtual array^>^ getCqListeners(); internal: @@ -78,8 +77,7 @@ namespace Generic inline CqAttributes( apache::geode::client::CqAttributes* nativeptr ) : SBWrap( nativeptr ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesFactory.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqAttributesFactory.cpp b/src/clicache/src/CqAttributesFactory.cpp index 0f384ea..adf24d3 100644 --- a/src/clicache/src/CqAttributesFactory.cpp +++ b/src/clicache/src/CqAttributesFactory.cpp @@ -32,10 +32,9 @@ namespace Apache { namespace Client { -namespace Generic - { + generic - void CqAttributesFactory::AddCqListener(Generic::ICqListener^ cqListener ) + void CqAttributesFactory::AddCqListener(Client::ICqListener^ cqListener ) { apache::geode::client::CqListenerPtr listenerptr; if ( cqListener != nullptr ) { @@ -83,7 +82,7 @@ namespace Generic } generic - void CqAttributesFactory::InitCqListeners(array^>^ cqListeners) + void CqAttributesFactory::InitCqListeners(array^>^ cqListeners) { apache::geode::client::VectorOfCqListener vrr; for( int i = 0; i < cqListeners->Length; i++ ) @@ -134,12 +133,11 @@ namespace Generic } generic - Generic::CqAttributes^ CqAttributesFactory::Create( ) + Client::CqAttributes^ CqAttributesFactory::Create( ) { - return Generic::CqAttributes::Create(NativePtr->create().ptr()); - } + return Client::CqAttributes::Create(NativePtr->create().ptr()); + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } - } } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesFactory.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqAttributesFactory.hpp b/src/clicache/src/CqAttributesFactory.hpp index c85422c..8a7f4e7 100644 --- a/src/clicache/src/CqAttributesFactory.hpp +++ b/src/clicache/src/CqAttributesFactory.hpp @@ -33,8 +33,6 @@ namespace Apache { namespace Client { -namespace Generic - { /* generic @@ -61,7 +59,7 @@ namespace Generic : UMWrap( new apache::geode::client::CqAttributesFactory( ), true ) { } - inline CqAttributesFactory(Generic::CqAttributes^ cqAttributes ) + inline CqAttributesFactory(Client::CqAttributes^ cqAttributes ) : UMWrap( new apache::geode::client::CqAttributesFactory(apache::geode::client::CqAttributesPtr(GetNativePtrFromSBWrapGeneric(cqAttributes ))), true ) { } @@ -70,22 +68,21 @@ namespace Generic /// /// add a cqListener /// - void AddCqListener(Generic::ICqListener^ cqListener); + void AddCqListener(Client::ICqListener^ cqListener); /// /// Initialize with an array of listeners /// - void InitCqListeners( array^>^ cqListeners ); + void InitCqListeners( array^>^ cqListeners ); // FACTORY METHOD /// /// Creates a CqAttributes with the current settings. /// - Generic::CqAttributes^ Create( ); + Client::CqAttributes^ Create( ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesMutator.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqAttributesMutator.cpp b/src/clicache/src/CqAttributesMutator.cpp index 96532ba..0e2b303 100644 --- a/src/clicache/src/CqAttributesMutator.cpp +++ b/src/clicache/src/CqAttributesMutator.cpp @@ -30,11 +30,9 @@ namespace Apache { namespace Client { -namespace Generic - { generic - void CqAttributesMutator::AddCqListener( Generic::ICqListener^ cqListener ) + void CqAttributesMutator::AddCqListener( Client::ICqListener^ cqListener ) { apache::geode::client::CqListenerPtr listenerptr; if ( cqListener != nullptr ) { @@ -82,14 +80,14 @@ namespace Generic } generic - void CqAttributesMutator::RemoveCqListener( Generic::ICqListener^ cqListener ) + void CqAttributesMutator::RemoveCqListener( Client::ICqListener^ cqListener ) { - Generic::ICqStatusListener^ lister = dynamic_cast^>(cqListener); + Client::ICqStatusListener^ lister = dynamic_cast^>(cqListener); if (lister != nullptr) { CqStatusListenerGeneric^ cqlg = gcnew CqStatusListenerGeneric(); cqlg->AddCqListener(cqListener); apache::geode::client::CqStatusListenerPtr lptr(new apache::geode::client::ManagedCqStatusListenerGeneric( - (Generic::ICqStatusListener^) lister )); + (Client::ICqStatusListener^) lister )); ((apache::geode::client::ManagedCqStatusListenerGeneric*)lptr.ptr())->setptr(cqlg); try { IntPtr value; @@ -106,7 +104,7 @@ namespace Generic CqListenerGeneric^ cqlg = gcnew CqListenerGeneric(); cqlg->AddCqListener(cqListener); apache::geode::client::CqListenerPtr lptr(new apache::geode::client::ManagedCqListenerGeneric( - (Generic::ICqListener^) cqListener )); + (Client::ICqListener^) cqListener )); ((apache::geode::client::ManagedCqListenerGeneric*)lptr.ptr())->setptr(cqlg); try { IntPtr value; @@ -122,12 +120,12 @@ namespace Generic } generic - void CqAttributesMutator::SetCqListeners(array^>^ newListeners) + void CqAttributesMutator::SetCqListeners(array^>^ newListeners) { apache::geode::client::VectorOfCqListener vrr; for( int i = 0; i < newListeners->Length; i++ ) { - Generic::ICqStatusListener^ lister = dynamic_cast^>(newListeners[i]); + Client::ICqStatusListener^ lister = dynamic_cast^>(newListeners[i]); if (lister != nullptr) { apache::geode::client::CqStatusListenerPtr cptr(new apache::geode::client::ManagedCqStatusListenerGeneric( (ICqStatusListener^)lister )); @@ -148,7 +146,7 @@ namespace Generic ((apache::geode::client::ManagedCqStatusListenerGeneric*)vrr[i].ptr())->setptr(cqlg); } else { - Generic::ICqListener^ lister = newListeners[i]; + Client::ICqListener^ lister = newListeners[i]; apache::geode::client::CqListenerPtr cptr(new apache::geode::client::ManagedCqListenerGeneric( (ICqListener^)lister )); vrr.push_back(cptr); @@ -170,9 +168,8 @@ namespace Generic } NativePtr->setCqListeners( vrr ); - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } - } } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesMutator.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqAttributesMutator.hpp b/src/clicache/src/CqAttributesMutator.hpp index 8824aa3..c3a1e97 100644 --- a/src/clicache/src/CqAttributesMutator.hpp +++ b/src/clicache/src/CqAttributesMutator.hpp @@ -32,8 +32,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic interface class ICqListener; @@ -41,9 +39,9 @@ namespace Generic generic private ref class CqListenerHelper sealed{ public: - static IDictionary^, IntPtr>^ + static IDictionary^, IntPtr>^ m_ManagedVsUnManagedCqLstrDict = gcnew - Dictionary^, IntPtr>(); + Dictionary^, IntPtr>(); static ReaderWriterLock^ g_readerWriterLock = gcnew ReaderWriterLock(); }; @@ -64,20 +62,20 @@ namespace Generic /// /// user-defined cq listener, or null for no cache listener /// - void AddCqListener( Generic::ICqListener^ cqListener ); + void AddCqListener( Client::ICqListener^ cqListener ); /// /// Remove a CqListener for the cq. /// - void RemoveCqListener(Generic::ICqListener^ aListener); + void RemoveCqListener(Client::ICqListener^ aListener); /// /// Initialize with an array of listeners /// - void SetCqListeners(array^>^ newListeners); + void SetCqListeners(array^>^ newListeners); internal: @@ -89,13 +87,13 @@ namespace Generic /// /// The managed wrapper object; null if the native pointer is null. /// - inline static Generic::CqAttributesMutator^ Create( apache::geode::client::CqAttributesMutator* nativeptr ) + inline static Client::CqAttributesMutator^ Create( apache::geode::client::CqAttributesMutator* nativeptr ) { if (nativeptr == nullptr) { return nullptr; } - return gcnew Generic::CqAttributesMutator( nativeptr ); + return gcnew Client::CqAttributesMutator( nativeptr ); } @@ -108,8 +106,7 @@ namespace Generic inline CqAttributesMutator( apache::geode::client::CqAttributesMutator* nativeptr ) : SBWrap( nativeptr ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqEvent.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqEvent.cpp b/src/clicache/src/CqEvent.cpp index 4e0ecd3..dc1e2b0 100644 --- a/src/clicache/src/CqEvent.cpp +++ b/src/clicache/src/CqEvent.cpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic CqQuery^ CqEvent::getCq( ) @@ -70,10 +68,8 @@ namespace Generic apache::geode::client::CacheableBytesPtr deltaBytes = NativePtr->getDeltaValue( ); CacheableBytes^ managedDeltaBytes = ( CacheableBytes^ ) CacheableBytes::Create( deltaBytes.ptr( ) ); return ( array< Byte >^ ) managedDeltaBytes; - } - + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqEvent.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqEvent.hpp b/src/clicache/src/CqEvent.hpp index a394ce0..2e960da 100644 --- a/src/clicache/src/CqEvent.hpp +++ b/src/clicache/src/CqEvent.hpp @@ -34,8 +34,7 @@ namespace Apache { namespace Client { -namespace Generic - { + interface class IGFSerializable; //interface class ICqEvent; //interface class ICacheableKey; @@ -89,8 +88,7 @@ namespace Generic inline CqEvent( const apache::geode::client::CqEvent* nativeptr ) : UMWrap( const_cast( nativeptr ), false ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqListener.hpp b/src/clicache/src/CqListener.hpp index 839a1b4..ddeda40 100644 --- a/src/clicache/src/CqListener.hpp +++ b/src/clicache/src/CqListener.hpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic ref class CqEvent; //interface class ICqListener; @@ -107,8 +106,7 @@ namespace Generic } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqOperation.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqOperation.hpp b/src/clicache/src/CqOperation.hpp index e8d2755..7a20773 100644 --- a/src/clicache/src/CqOperation.hpp +++ b/src/clicache/src/CqOperation.hpp @@ -31,8 +31,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Enumerated type for CqOperationType @@ -82,8 +80,8 @@ namespace Generic inline CqOperation( apache::geode::client::CqOperation* nativeptr ) : UMWrap( nativeptr, false ) { } }; - } - } -} - } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqQuery.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqQuery.cpp b/src/clicache/src/CqQuery.cpp index f28f367..48d7016 100644 --- a/src/clicache/src/CqQuery.cpp +++ b/src/clicache/src/CqQuery.cpp @@ -34,8 +34,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic ICqResults^ CqQuery::ExecuteWithInitialResults() @@ -199,9 +197,8 @@ namespace Generic return NativePtr->isClosed( ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqQuery.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqQuery.hpp b/src/clicache/src/CqQuery.hpp index f91d415..b6427f6 100644 --- a/src/clicache/src/CqQuery.hpp +++ b/src/clicache/src/CqQuery.hpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic interface class ICqResults; @@ -186,8 +185,7 @@ namespace Generic inline CqQuery( apache::geode::client::CqQuery* nativeptr ) : SBWrap( nativeptr ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqServiceStatistics.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqServiceStatistics.cpp b/src/clicache/src/CqServiceStatistics.cpp index f2dd044..4f7d130 100644 --- a/src/clicache/src/CqServiceStatistics.cpp +++ b/src/clicache/src/CqServiceStatistics.cpp @@ -25,8 +25,7 @@ namespace Apache { namespace Client { -namespace Generic - { + uint32_t CqServiceStatistics::numCqsActive( ) { return NativePtr->numCqsActive( ); @@ -46,8 +45,8 @@ namespace Generic uint32_t CqServiceStatistics::numCqsOnClient( ) { return NativePtr->numCqsOnClient( ); - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqServiceStatistics.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqServiceStatistics.hpp b/src/clicache/src/CqServiceStatistics.hpp index 286a0d1..7f060cb 100644 --- a/src/clicache/src/CqServiceStatistics.hpp +++ b/src/clicache/src/CqServiceStatistics.hpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Defines common statistical information for cqservice @@ -96,8 +94,7 @@ namespace Generic inline CqServiceStatistics( apache::geode::client::CqServiceStatistics* nativeptr ) : SBWrap( nativeptr ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqState.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqState.cpp b/src/clicache/src/CqState.cpp index 8d7bdbf..d6af0c1 100644 --- a/src/clicache/src/CqState.cpp +++ b/src/clicache/src/CqState.cpp @@ -29,8 +29,6 @@ namespace Apache { namespace Client { -namespace Generic - { String^ CqState::ToString() { @@ -87,9 +85,8 @@ namespace Generic else state = CqStateType::INVALID; return state; - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqState.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqState.hpp b/src/clicache/src/CqState.hpp index fd3d065..11c5113 100644 --- a/src/clicache/src/CqState.hpp +++ b/src/clicache/src/CqState.hpp @@ -29,8 +29,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Enumerated type for cq state @@ -93,8 +91,7 @@ namespace Generic : UMWrap( nativeptr, false ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqStatistics.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqStatistics.cpp b/src/clicache/src/CqStatistics.cpp index 696ae5f..b3e0aad 100644 --- a/src/clicache/src/CqStatistics.cpp +++ b/src/clicache/src/CqStatistics.cpp @@ -25,8 +25,7 @@ namespace Apache { namespace Client { -namespace Generic - { + uint32_t CqStatistics::numInserts( ) { return NativePtr->numInserts( ); @@ -42,8 +41,8 @@ namespace Generic uint32_t CqStatistics::numEvents( ) { return NativePtr->numEvents( ); - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqStatistics.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/CqStatistics.hpp b/src/clicache/src/CqStatistics.hpp index 5b5355d..043a085 100644 --- a/src/clicache/src/CqStatistics.hpp +++ b/src/clicache/src/CqStatistics.hpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Defines common statistical information for a cq. @@ -88,8 +86,7 @@ namespace Generic inline CqStatistics( apache::geode::client::CqStatistics* nativeptr ) : SBWrap( nativeptr ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataInput.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DataInput.cpp b/src/clicache/src/DataInput.cpp index 7de8f6c..d2614d2 100644 --- a/src/clicache/src/DataInput.cpp +++ b/src/clicache/src/DataInput.cpp @@ -45,8 +45,7 @@ namespace Apache { namespace Client { -namespace Generic - { + DataInput::DataInput( uint8_t* buffer, int size ) { m_ispdxDesrialization = false; @@ -1086,9 +1085,9 @@ namespace Generic else { return ReadUTFHuge(); - } - } - } // end namespace generic - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataInput.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DataInput.hpp b/src/clicache/src/DataInput.hpp index ccce9fa..198a762 100644 --- a/src/clicache/src/DataInput.hpp +++ b/src/clicache/src/DataInput.hpp @@ -34,8 +34,6 @@ namespace Apache { namespace Client { -namespace Generic - { interface class IGFSerializable; @@ -44,7 +42,7 @@ namespace Generic /// strings, IGFSerializable objects from a byte stream. /// public ref class DataInput sealed - : public Generic::Internal::UMWrap + : public Client::Internal::UMWrap { public: @@ -688,7 +686,7 @@ namespace Generic void Cleanup( ); }; - } // end namespace generic - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataOutput.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DataOutput.cpp b/src/clicache/src/DataOutput.cpp index 0d901b0..5a16b8e 100644 --- a/src/clicache/src/DataOutput.cpp +++ b/src/clicache/src/DataOutput.cpp @@ -34,8 +34,6 @@ namespace Apache { namespace Client { -namespace Generic - { void DataOutput::WriteByte( Byte value ) { @@ -457,9 +455,9 @@ namespace Generic return; } - //Apache::Geode::Client::Generic::Log::Debug("DataOutput::WriteObject " + obj); + //Apache::Geode::Client::Log::Debug("DataOutput::WriteObject " + obj); - Byte typeId = Apache::Geode::Client::Generic::Serializable::GetManagedTypeMappingGeneric(obj->GetType()); + Byte typeId = Apache::Geode::Client::Serializable::GetManagedTypeMappingGeneric(obj->GetType()); switch(typeId) { @@ -872,8 +870,8 @@ namespace Generic void DataOutput::WriteDoubleArray(array^ doubleArray) { WriteObject(doubleArray); - } - } // end namespace generic - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataOutput.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DataOutput.hpp b/src/clicache/src/DataOutput.hpp index ed4ab35..a4034df 100644 --- a/src/clicache/src/DataOutput.hpp +++ b/src/clicache/src/DataOutput.hpp @@ -39,8 +39,6 @@ namespace Apache { namespace Client { -namespace Generic - { interface class IGFSerializable; @@ -50,7 +48,7 @@ namespace Generic /// This class is intentionally not thread safe. /// public ref class DataOutput sealed - : public Generic::Internal::UMWrap + : public Client::Internal::UMWrap { private: int32_t m_cursor; @@ -603,7 +601,7 @@ namespace Generic m_ispdxSerialization = false; } }; - } // end namespace generic - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DiskPolicyType.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DiskPolicyType.hpp b/src/clicache/src/DiskPolicyType.hpp index f131066..051e123 100644 --- a/src/clicache/src/DiskPolicyType.hpp +++ b/src/clicache/src/DiskPolicyType.hpp @@ -31,8 +31,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Enumerated type for disk policy. @@ -81,9 +79,8 @@ namespace Generic // return (type == DiskPolicyType::Persist); //} }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DistributedSystem.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp index 8191d63..40e942a 100644 --- a/src/clicache/src/DistributedSystem.cpp +++ b/src/clicache/src/DistributedSystem.cpp @@ -127,8 +127,7 @@ namespace Apache { namespace Client { -namespace Generic - { + DistributedSystem^ DistributedSystem::Connect(String^ name) { return DistributedSystem::Connect(name, nullptr); @@ -573,12 +572,12 @@ namespace Generic /* Serializable::RegisterTypeGeneric( apache::geode::client::GemfireTypeIds::PdxType, - gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::PdxType::CreateDeserializable), + gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::PdxType::CreateDeserializable), nullptr);*/ Serializable::RegisterTypeGeneric( apache::geode::client::GemfireTypeIds::EnumInfo, - gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::EnumInfo::CreateDeserializable), + gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::EnumInfo::CreateDeserializable), nullptr); // End register generic wrapper types for built-in types @@ -755,7 +754,7 @@ namespace Generic Create(apache::geode::client::DistributedSystem::getInstance().ptr()); // Register managed AppDomain context with unmanaged. - apache::geode::client::createAppDomainContext = &Apache::Geode::Client::Generic::createAppDomainContext; + apache::geode::client::createAppDomainContext = &Apache::Geode::Client::createAppDomainContext; } void DistributedSystem::UnregisterBuiltinManagedTypes() @@ -804,12 +803,12 @@ namespace Generic } } - Apache::Geode::Client::Generic::SystemProperties^ DistributedSystem::SystemProperties::get() + Apache::Geode::Client::SystemProperties^ DistributedSystem::SystemProperties::get() { _GF_MG_EXCEPTION_TRY2 // TODO - return Apache::Geode::Client::Generic::SystemProperties::Create( + return Apache::Geode::Client::SystemProperties::Create( apache::geode::client::DistributedSystem::getSystemProperties()); //return nullptr; @@ -905,8 +904,8 @@ namespace Generic void DistributedSystem::unregisterCliCallback() { apache::geode::client::DistributedSystemImpl::unregisterCliCallback( System::Threading::Thread::GetDomainID()); - } - } // end namespace generic - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DistributedSystem.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/DistributedSystem.hpp b/src/clicache/src/DistributedSystem.hpp index f69f112..381c402 100644 --- a/src/clicache/src/DistributedSystem.hpp +++ b/src/clicache/src/DistributedSystem.hpp @@ -32,8 +32,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// DistributedSystem encapsulates this applications "connection" into the /// GemFire Java servers. @@ -44,7 +43,7 @@ namespace Generic /// DistributedSystem. /// public ref class DistributedSystem sealed - : public Generic::Internal::SBWrap + : public Client::Internal::SBWrap { public: @@ -91,9 +90,9 @@ namespace Generic /// DistributedSystem. /// /// the SystemProperties - static property Apache::Geode::Client::Generic::SystemProperties^ SystemProperties + static property Apache::Geode::Client::SystemProperties^ SystemProperties { - static Apache::Geode::Client::Generic::SystemProperties^ get( ); + static Apache::Geode::Client::SystemProperties^ get( ); } /// @@ -212,7 +211,7 @@ namespace Generic static CliCallbackDelegate^ m_cliCallBackObj; }; - } // end namespace generic - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/EntryEvent.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/EntryEvent.cpp b/src/clicache/src/EntryEvent.cpp index baca33d..bbe3191 100644 --- a/src/clicache/src/EntryEvent.cpp +++ b/src/clicache/src/EntryEvent.cpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic EntryEvent::EntryEvent(IRegion^ region, @@ -54,7 +52,7 @@ namespace Generic IRegion^ EntryEvent::Region::get( ) { apache::geode::client::RegionPtr& regionptr( NativePtr->getRegion( ) ); - return Generic::Region::Create( regionptr.ptr( ) ); + return Client::Region::Create( regionptr.ptr( ) ); } generic @@ -89,9 +87,8 @@ namespace Generic bool EntryEvent::RemoteOrigin::get( ) { return NativePtr->remoteOrigin( ); - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/EntryEvent.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/EntryEvent.hpp b/src/clicache/src/EntryEvent.hpp index 3be6e4d..b5cb069 100644 --- a/src/clicache/src/EntryEvent.hpp +++ b/src/clicache/src/EntryEvent.hpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + interface class IGFSerializable; // ref class Region; @@ -118,8 +117,7 @@ namespace Generic : Internal::UMWrap( const_cast( nativeptr ), false ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ExceptionTypes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp index 9c739fc..805a62c 100644 --- a/src/clicache/src/ExceptionTypes.cpp +++ b/src/clicache/src/ExceptionTypes.cpp @@ -27,8 +27,6 @@ namespace Apache { namespace Client { -namespace Generic - { #define _GF_MG_EXCEPTION_ADD3(x) { "apache::geode::client::" #x, gcnew CreateException2( x::Create ) } #define _GF_MG_EXCEPTION_ADD4(x,y) { "apache::geode::client::" #y, gcnew CreateException2( x::Create ) } @@ -143,10 +141,10 @@ namespace Generic gcnew array{ mgMsg, innerException })); if ( mgEx != nullptr ) { return mgEx; - } - } - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } if (innerException == nullptr) { return gcnew GemFireException(exName + ": " + exMsg, http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ExceptionTypes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ExceptionTypes.hpp b/src/clicache/src/ExceptionTypes.hpp index 090a93c..8094619 100644 --- a/src/clicache/src/ExceptionTypes.hpp +++ b/src/clicache/src/ExceptionTypes.hpp @@ -32,8 +32,6 @@ namespace Apache { namespace Client { -namespace Generic - { ref class GemFireException; @@ -273,7 +271,7 @@ namespace Generic #define _GF_MG_EXCEPTION_CATCH_ALL2 \ } \ catch (const apache::geode::client::Exception& ex) { \ - throw Apache::Geode::Client::Generic::GemFireException::Get(ex); \ + throw Apache::Geode::Client::GemFireException::Get(ex); \ } \ catch (System::AccessViolationException^ ex) { \ throw ex; \ @@ -679,8 +677,7 @@ namespace Generic /// Thrown if commit rebalance happens during a transaction. /// _GF_MG_EXCEPTION_DEF3( TransactionDataRebalancedException ); + } // namespace Client + } // namespace Geode +} // namespace Apache - } // end namespace Generic - } - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Execution.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Execution.cpp b/src/clicache/src/Execution.cpp index 53feacb..fdf6b98 100644 --- a/src/clicache/src/Execution.cpp +++ b/src/clicache/src/Execution.cpp @@ -34,8 +34,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic generic @@ -70,7 +68,7 @@ namespace Generic } generic - Execution^ Execution::WithCollector(Generic::IResultCollector^ rc) + Execution^ Execution::WithCollector(Client::IResultCollector^ rc) { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::ResultCollectorPtr rcptr; @@ -102,8 +100,8 @@ namespace Generic IResultCollector^ Execution::Execute(String^ func) { return Execute(func, DEFAULT_QUERY_RESPONSE_TIMEOUT); - } - } - } - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Execution.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Execution.hpp b/src/clicache/src/Execution.hpp index 173a56f..c821776 100644 --- a/src/clicache/src/Execution.hpp +++ b/src/clicache/src/Execution.hpp @@ -30,9 +30,7 @@ namespace Apache { namespace Client { -//interface class IGFSerializable; - namespace Generic - { + generic interface class IResultCollector; @@ -105,8 +103,7 @@ namespace Apache private: IResultCollector^ m_rc; }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ExpirationAction.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ExpirationAction.hpp b/src/clicache/src/ExpirationAction.hpp index d0ae932..f5ccd10 100644 --- a/src/clicache/src/ExpirationAction.hpp +++ b/src/clicache/src/ExpirationAction.hpp @@ -31,8 +31,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Enumerated type for expiration (LRU) actions. @@ -130,9 +128,8 @@ namespace Generic (type == ExpirationAction::Destroy); } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/FunctionService.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/FunctionService.cpp b/src/clicache/src/FunctionService.cpp index 62bd9b4..6442151 100644 --- a/src/clicache/src/FunctionService.cpp +++ b/src/clicache/src/FunctionService.cpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic generic Execution^ FunctionService::OnRegion( IRegion^ rg ) @@ -41,7 +40,7 @@ namespace Generic IRegion^ regImpl = safe_cast^>( rg); - apache::geode::client::RegionPtr regionptr(GetNativePtrFromSBWrapGeneric((Generic::Region^)regImpl)); + apache::geode::client::RegionPtr regionptr(GetNativePtrFromSBWrapGeneric((Client::Region^)regImpl)); apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onRegion( regionptr ) ); @@ -82,8 +81,8 @@ namespace Generic { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ - Apache::Geode::Client::Generic::Cache^ realCache = - dynamic_cast(cache); + Apache::Geode::Client::Cache^ realCache = + dynamic_cast(cache); if(realCache != nullptr) { @@ -95,8 +94,8 @@ namespace Generic } else { - Apache::Geode::Client::Generic::AuthenticatedCache^ authCache = - dynamic_cast(cache); + Apache::Geode::Client::AuthenticatedCache^ authCache = + dynamic_cast(cache); apache::geode::client::RegionServicePtr cacheptr(GetNativePtr( authCache ) ); apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onServer( @@ -113,8 +112,8 @@ namespace Generic { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ - Apache::Geode::Client::Generic::Cache^ realCache = - dynamic_cast(cache); + Apache::Geode::Client::Cache^ realCache = + dynamic_cast(cache); if(realCache != nullptr) { @@ -126,8 +125,8 @@ namespace Generic } else { - Apache::Geode::Client::Generic::AuthenticatedCache^ authCache = - dynamic_cast(cache); + Apache::Geode::Client::AuthenticatedCache^ authCache = + dynamic_cast(cache); apache::geode::client::RegionServicePtr cacheptr(GetNativePtr( authCache ) ); apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onServers( @@ -136,8 +135,8 @@ namespace Generic } _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/FunctionService.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/FunctionService.hpp b/src/clicache/src/FunctionService.hpp index 430afaa..b63bc59 100644 --- a/src/clicache/src/FunctionService.hpp +++ b/src/clicache/src/FunctionService.hpp @@ -31,8 +31,7 @@ namespace Apache { namespace Client { -namespace Generic - { + // generic ref class Pool; @@ -104,8 +103,7 @@ namespace Generic : SBWrap( nativeptr ) { } }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/GemFireClassIds.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/GemFireClassIds.hpp b/src/clicache/src/GemFireClassIds.hpp index b76fa8b..03973e2 100644 --- a/src/clicache/src/GemFireClassIds.hpp +++ b/src/clicache/src/GemFireClassIds.hpp @@ -29,8 +29,6 @@ namespace Apache { namespace Client { -namespace Generic - { struct PdxTypes { @@ -364,9 +362,8 @@ namespace Generic literal Byte DATE_SIZE = 8; }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IAuthInitialize.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IAuthInitialize.hpp b/src/clicache/src/IAuthInitialize.hpp index de926af..17b92d4 100644 --- a/src/clicache/src/IAuthInitialize.hpp +++ b/src/clicache/src/IAuthInitialize.hpp @@ -29,8 +29,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// Specifies the mechanism to obtain credentials for a client. /// It is mandantory for clients when the server is running in secure @@ -78,7 +77,7 @@ namespace Generic void Close(); }; - } - } -} - } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICacheListener.hpp b/src/clicache/src/ICacheListener.hpp index 3c6e3b8..f87cf38 100644 --- a/src/clicache/src/ICacheListener.hpp +++ b/src/clicache/src/ICacheListener.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// An application plug-in that can be installed on a region. /// @@ -205,8 +204,7 @@ namespace Generic /// void AfterRegionDisconnected( IRegion^ region ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICacheLoader.hpp b/src/clicache/src/ICacheLoader.hpp index 6a54b9d..aabd64f 100644 --- a/src/clicache/src/ICacheLoader.hpp +++ b/src/clicache/src/ICacheLoader.hpp @@ -29,8 +29,7 @@ namespace Apache { namespace Client { -namespace Generic - { + //interface class ICacheableKey; /// @@ -110,8 +109,7 @@ namespace Generic /// void Close( IRegion^ region ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICacheWriter.hpp b/src/clicache/src/ICacheWriter.hpp index d3e78c1..0ff6be5 100644 --- a/src/clicache/src/ICacheWriter.hpp +++ b/src/clicache/src/ICacheWriter.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// An application plug-in that can be installed on a region. /// Defines methods that are called before entry modification, @@ -167,8 +166,7 @@ namespace Generic /// void Close( IRegion^ region ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheableKey.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICacheableKey.hpp b/src/clicache/src/ICacheableKey.hpp index eb04a68..13f85b7 100644 --- a/src/clicache/src/ICacheableKey.hpp +++ b/src/clicache/src/ICacheableKey.hpp @@ -29,8 +29,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// This interface class is the superclass of all user objects @@ -64,8 +62,7 @@ namespace Generic /// bool Equals( ICacheableKey^ other ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqAttributes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICqAttributes.hpp b/src/clicache/src/ICqAttributes.hpp index 5e15ded..b2ba5a9 100644 --- a/src/clicache/src/ICqAttributes.hpp +++ b/src/clicache/src/ICqAttributes.hpp @@ -26,8 +26,6 @@ namespace Apache { namespace Client { -namespace Generic - { interface class CqListener; @@ -112,8 +110,7 @@ namespace Generic /// void Close(); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqEvent.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICqEvent.hpp b/src/clicache/src/ICqEvent.hpp index 89f4d25..f4e2bb2 100644 --- a/src/clicache/src/ICqEvent.hpp +++ b/src/clicache/src/ICqEvent.hpp @@ -27,9 +27,7 @@ namespace Apache { namespace Client { -//ref class CqOperationType; - namespace Generic - { + interface class IGFSerializable; @@ -116,8 +114,7 @@ namespace Apache TResult /*Object^*/ getNewValue(); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICqListener.hpp b/src/clicache/src/ICqListener.hpp index e0350dd..2791aef 100644 --- a/src/clicache/src/ICqListener.hpp +++ b/src/clicache/src/ICqListener.hpp @@ -26,8 +26,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic ref class CqEvent; @@ -116,8 +114,7 @@ namespace Generic /// void Close(); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqResults.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICqResults.hpp b/src/clicache/src/ICqResults.hpp index 31cad15..481b5d5 100644 --- a/src/clicache/src/ICqResults.hpp +++ b/src/clicache/src/ICqResults.hpp @@ -31,8 +31,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic ref class SelectResultsIterator; @@ -45,8 +43,7 @@ namespace Generic : public ISelectResults { }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqStatusListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ICqStatusListener.hpp b/src/clicache/src/ICqStatusListener.hpp index 8f6e189..d572903 100644 --- a/src/clicache/src/ICqStatusListener.hpp +++ b/src/clicache/src/ICqStatusListener.hpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// Extension of CqListener. Adds two new methods to CqListener, one that @@ -53,7 +51,7 @@ namespace Generic virtual void OnCqConnected(); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IFixedPartitionResolver.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IFixedPartitionResolver.hpp b/src/clicache/src/IFixedPartitionResolver.hpp index fc24007..7ed58a1 100644 --- a/src/clicache/src/IFixedPartitionResolver.hpp +++ b/src/clicache/src/IFixedPartitionResolver.hpp @@ -28,10 +28,8 @@ namespace Apache { namespace Client { -ref class EntryEvent; + interface class IGFSerializable; - namespace Generic - { /// /// Implementers of interface FixedPartitionResolver helps to /// achieve explicit mapping of a "user defined" partition to a data member node. @@ -92,8 +90,7 @@ ref class EntryEvent; /// String^ GetPartitionName(EntryEvent^ opDetails); }; - } + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IGFDelta.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IGFDelta.hpp b/src/clicache/src/IGFDelta.hpp index 6098a9f..759b41e 100644 --- a/src/clicache/src/IGFDelta.hpp +++ b/src/clicache/src/IGFDelta.hpp @@ -25,8 +25,6 @@ namespace Apache { namespace Client { -namespace Generic - { ref class DataOutput; ref class DataInput; @@ -74,8 +72,7 @@ namespace Generic /// bool HasDelta( ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IGFSerializable.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IGFSerializable.hpp b/src/clicache/src/IGFSerializable.hpp index 2143b93..49d3e20 100644 --- a/src/clicache/src/IGFSerializable.hpp +++ b/src/clicache/src/IGFSerializable.hpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { ref class DataOutput; ref class DataInput; @@ -99,7 +97,7 @@ namespace Generic /// String^ ToString( ); }; - } // end namespace generic - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IGemFireCache.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IGemFireCache.hpp b/src/clicache/src/IGemFireCache.hpp index 795bc68..8e87955 100644 --- a/src/clicache/src/IGemFireCache.hpp +++ b/src/clicache/src/IGemFireCache.hpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// GemFireCache represents the singleton cache that must be created /// in order to connect to Gemfire server. @@ -83,16 +82,16 @@ namespace Generic /// property DistributedSystem^ DistributedSystem { - Apache::Geode::Client::Generic::DistributedSystem^ get( ); + Apache::Geode::Client::DistributedSystem^ get( ); } /// /// Returns the cache transaction manager of /// this cache. /// - property Apache::Geode::Client::Generic::CacheTransactionManager^ CacheTransactionManager + property Apache::Geode::Client::CacheTransactionManager^ CacheTransactionManager { - Apache::Geode::Client::Generic::CacheTransactionManager^ get( ); + Apache::Geode::Client::CacheTransactionManager^ get( ); } /// @@ -105,7 +104,7 @@ namespace Generic /// bool GetPdxReadSerialized(); }; - } // end namespace Generic - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPartitionResolver.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPartitionResolver.hpp b/src/clicache/src/IPartitionResolver.hpp index 4fdcb40..b693311 100644 --- a/src/clicache/src/IPartitionResolver.hpp +++ b/src/clicache/src/IPartitionResolver.hpp @@ -28,8 +28,7 @@ namespace Apache { namespace Client { -namespace Generic - { + interface class IGFSerializable; @@ -103,8 +102,7 @@ namespace Generic Object^ GetRoutingObject(EntryEvent^ key) ; }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxInstance.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxInstance.hpp b/src/clicache/src/IPdxInstance.hpp index 0e8f198..dee3cd0 100755 --- a/src/clicache/src/IPdxInstance.hpp +++ b/src/clicache/src/IPdxInstance.hpp @@ -25,9 +25,7 @@ namespace Apache { namespace Client { -namespace Generic - { - + /// ///PdxInstance provides run time access to the fields of a PDX without ///deserializing the PDX. Preventing deserialization saves time @@ -181,8 +179,7 @@ namespace Generic IWritablePdxInstance^ CreateWriter(); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxInstanceFactory.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxInstanceFactory.hpp b/src/clicache/src/IPdxInstanceFactory.hpp index 0bcebd9..64f9d18 100644 --- a/src/clicache/src/IPdxInstanceFactory.hpp +++ b/src/clicache/src/IPdxInstanceFactory.hpp @@ -25,9 +25,7 @@ namespace Apache { namespace Client { -namespace Generic - { - + /// /// PdxInstanceFactory gives you a way to create PdxInstances. /// Call the write methods to populate the field data and then call @@ -342,8 +340,7 @@ namespace Generic IPdxInstanceFactory^ MarkIdentityField(String^ fieldName); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxReader.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxReader.hpp b/src/clicache/src/IPdxReader.hpp index 96df19e..e5a36ec 100644 --- a/src/clicache/src/IPdxReader.hpp +++ b/src/clicache/src/IPdxReader.hpp @@ -26,8 +26,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// A IPdxReader will be passed to IPdxSerializable.fromData or /// during deserialization of a PDX. The domain class needs to deserialize field members @@ -206,7 +205,7 @@ namespace Generic /// The type of a member field, which value needs to read. Object^ ReadField(String^ fieldName, Type^ type); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxSerializable.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxSerializable.hpp b/src/clicache/src/IPdxSerializable.hpp index 3f1a8e2..caca571 100644 --- a/src/clicache/src/IPdxSerializable.hpp +++ b/src/clicache/src/IPdxSerializable.hpp @@ -27,8 +27,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// When a domain class implements PdxSerializable it marks /// itself as a PDX. @@ -62,7 +61,7 @@ namespace Generic void FromData( IPdxReader^ reader ); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxSerializer.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxSerializer.hpp b/src/clicache/src/IPdxSerializer.hpp index 6676b48..b125ce7 100755 --- a/src/clicache/src/IPdxSerializer.hpp +++ b/src/clicache/src/IPdxSerializer.hpp @@ -27,8 +27,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// The IPdxSerializer interface allows domain classes to be /// serialized and deserialized as PDXs without modification @@ -63,7 +62,7 @@ namespace Generic Object^ FromData(String^ classname, IPdxReader^ reader ); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxTypeMapper.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxTypeMapper.hpp b/src/clicache/src/IPdxTypeMapper.hpp index 6530946..f2b5fd6 100755 --- a/src/clicache/src/IPdxTypeMapper.hpp +++ b/src/clicache/src/IPdxTypeMapper.hpp @@ -24,9 +24,7 @@ namespace Apache { namespace Client { -namespace Generic - { - + /// /// Application can implement this interface to map pdx type name to local type name. /// Need to set this using @@ -48,8 +46,7 @@ namespace Generic /// String^ FromPdxTypeName(String^ pdxTypeName); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } - } -} http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxUnreadFields.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxUnreadFields.hpp b/src/clicache/src/IPdxUnreadFields.hpp index 5986437..a9d9ba3 100644 --- a/src/clicache/src/IPdxUnreadFields.hpp +++ b/src/clicache/src/IPdxUnreadFields.hpp @@ -24,8 +24,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// Serialize the data in gemfire Portable Data eXchange(Pdx) Format. /// This format provides class versioning(forward and backward compability of types) in cache. @@ -35,7 +34,7 @@ namespace Generic { }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPdxWriter.hpp b/src/clicache/src/IPdxWriter.hpp index 16a1fa6..af854d2 100644 --- a/src/clicache/src/IPdxWriter.hpp +++ b/src/clicache/src/IPdxWriter.hpp @@ -28,8 +28,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// A IPdxWriter will be passed to IPdxSerializable.toData /// when it is serializing the domain class. The domain class needs to serialize member @@ -242,7 +241,7 @@ namespace Generic /// this PdxWriter IPdxWriter^ WriteField(String^ fieldName, Object^ fieldValue, Type^ type); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPersistenceManager.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IPersistenceManager.hpp b/src/clicache/src/IPersistenceManager.hpp index e175dc7..36b3f1f 100644 --- a/src/clicache/src/IPersistenceManager.hpp +++ b/src/clicache/src/IPersistenceManager.hpp @@ -28,8 +28,6 @@ namespace Apache { namespace Client { -namespace Generic - { /// /// IPersistenceManager interface for persistence and overflow. @@ -102,7 +100,7 @@ namespace Generic void Close(); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IRegion.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IRegion.hpp b/src/clicache/src/IRegion.hpp index a3ed6a1..f3dc502 100644 --- a/src/clicache/src/IRegion.hpp +++ b/src/clicache/src/IRegion.hpp @@ -27,7 +27,7 @@ using namespace System::Collections::Generic; /* using namespace Apache::Geode::Client; -using namespace Apache::Geode::Client::Generic; +using namespace Apache::Geode::Client; */ namespace Apache @@ -36,8 +36,7 @@ namespace Apache { namespace Client { -namespace Generic - { + ref class Cache; ref class CacheStatistics; //interface class IGFSerializable; @@ -1655,7 +1654,7 @@ namespace Generic /// property AttributesMutator^ AttributesMutator { - Apache::Geode::Client::Generic::AttributesMutator^ get(); + Apache::Geode::Client::AttributesMutator^ get(); } /// @@ -1709,7 +1708,7 @@ namespace Generic /// /// region has been destroyed /// - Generic::RegionEntry^ GetEntry( TKey key ); + Client::RegionEntry^ GetEntry( TKey key ); /// /// Gets the entries in this region. @@ -1719,15 +1718,15 @@ namespace Generic /// if true, also return all nested subregion entries /// /// collection of entries - System::Collections::Generic::ICollection^>^ GetEntries(bool recursive); + System::Collections::Generic::ICollection^>^ GetEntries(bool recursive); /// /// Gets the RegionService for this region. /// /// RegionService - property Apache::Geode::Client::Generic::IRegionService^ RegionService + property Apache::Geode::Client::IRegionService^ RegionService { - Apache::Geode::Client::Generic::IRegionService^ get( ); + Apache::Geode::Client::IRegionService^ get( ); } /// @@ -2069,8 +2068,7 @@ namespace Generic Object^ SelectValue( String^ predicate, uint32_t timeout ); }; - - } - } -} -} //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IRegionService.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IRegionService.hpp b/src/clicache/src/IRegionService.hpp index 708a284..d09685d 100644 --- a/src/clicache/src/IRegionService.hpp +++ b/src/clicache/src/IRegionService.hpp @@ -33,8 +33,7 @@ namespace Apache { namespace Client { -namespace Generic - { + interface class IPdxInstanceFactory; /// /// A RegionService provides access to existing regions that exist @@ -103,7 +102,7 @@ namespace Generic /// before actually firing a query. /// generic - Generic::QueryService^ GetQueryService(); + Client::QueryService^ GetQueryService(); /// /// Returns an array of root regions in the cache. This set is a /// snapshot and is not backed by the cache. @@ -123,7 +122,7 @@ namespace Generic /// IPdxInstanceFactory^ CreatePdxInstanceFactory(String^ className); }; - } // end namespace Generic - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IResultCollector.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IResultCollector.hpp b/src/clicache/src/IResultCollector.hpp index 1da4846..3adc048 100644 --- a/src/clicache/src/IResultCollector.hpp +++ b/src/clicache/src/IResultCollector.hpp @@ -27,8 +27,7 @@ namespace Apache { namespace Client { -namespace Generic - { + interface class IGFSerializable; /* generic @@ -75,8 +74,7 @@ namespace Generic void ClearResults(/*bool*/); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ISelectResults.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ISelectResults.hpp b/src/clicache/src/ISelectResults.hpp index 378ff82..0b9fa4e 100644 --- a/src/clicache/src/ISelectResults.hpp +++ b/src/clicache/src/ISelectResults.hpp @@ -30,8 +30,6 @@ namespace Apache { namespace Client { -namespace Generic - { generic ref class SelectResultsIterator; @@ -64,18 +62,17 @@ namespace Generic /// /// Get an object at the given index. /// - property /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult GFINDEXER( size_t ) + property /*Apache::Geode::Client::IGFSerializable^*/TResult GFINDEXER( size_t ) { - /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult get( size_t index ); + /*Apache::Geode::Client::IGFSerializable^*/TResult get( size_t index ); } /// /// Get an iterator for the result set. /// - Apache::Geode::Client::Generic::SelectResultsIterator^ GetIterator( ); + Apache::Geode::Client::SelectResultsIterator^ GetIterator( ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ISubscriptionService.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ISubscriptionService.hpp b/src/clicache/src/ISubscriptionService.hpp index da1e635..79acb4b 100644 --- a/src/clicache/src/ISubscriptionService.hpp +++ b/src/clicache/src/ISubscriptionService.hpp @@ -26,8 +26,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic /// /// This generic interface class provides all Register Interest API's for @@ -621,10 +620,7 @@ namespace Generic void UnregisterRegex( String^ regex ); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - - } - -} - } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ITransactionListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ITransactionListener.hpp b/src/clicache/src/ITransactionListener.hpp index 1b04fe0..dfa3ee9 100644 --- a/src/clicache/src/ITransactionListener.hpp +++ b/src/clicache/src/ITransactionListener.hpp @@ -27,8 +27,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// An application plug-in that can be installed for getting events for /// cache transactions. @@ -77,9 +76,8 @@ namespace Generic /// void Close(); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace #endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ITransactionWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ITransactionWriter.hpp b/src/clicache/src/ITransactionWriter.hpp index 7889445..bb41fff 100644 --- a/src/clicache/src/ITransactionWriter.hpp +++ b/src/clicache/src/ITransactionWriter.hpp @@ -27,8 +27,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// A callback that is allowed to veto a transaction. Only one TransactionWriter can exist /// per cache, and only one TransactionWriter will be fired in the @@ -55,9 +54,8 @@ namespace Generic void BeforeCommit(TransactionEvent^ te); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - } - } -} - } //namespace #endif http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IWritablePdxInstance.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/IWritablePdxInstance.hpp b/src/clicache/src/IWritablePdxInstance.hpp index 51b2058..160ffb8 100755 --- a/src/clicache/src/IWritablePdxInstance.hpp +++ b/src/clicache/src/IWritablePdxInstance.hpp @@ -24,8 +24,7 @@ namespace Apache { namespace Client { -namespace Generic - { + /// /// WritablePdxInstance is a that also supports field modification /// using the method. @@ -48,7 +47,7 @@ namespace Generic void SetField(String^ fieldName, Object^ value); }; - } - } - } -} + } // namespace Client + } // namespace Geode +} // namespace Apache + http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/LocalRegion.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/LocalRegion.cpp b/src/clicache/src/LocalRegion.cpp index fc89957..3040a49 100644 --- a/src/clicache/src/LocalRegion.cpp +++ b/src/clicache/src/LocalRegion.cpp @@ -34,8 +34,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic TValue LocalRegion::Get(TKey key, Object^ callbackArg) { @@ -547,13 +546,13 @@ namespace Generic } generic - Apache::Geode::Client::Generic::RegionAttributes^ LocalRegion::Attributes::get() + Apache::Geode::Client::RegionAttributes^ LocalRegion::Attributes::get() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::RegionAttributesPtr& nativeptr( NativePtr->getAttributes( ) ); - return Apache::Geode::Client::Generic::RegionAttributes::Create(nativeptr.ptr()); + return Apache::Geode::Client::RegionAttributes::Create(nativeptr.ptr()); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } @@ -566,18 +565,18 @@ namespace Generic apache::geode::client::AttributesMutatorPtr& nativeptr( NativePtr->getAttributesMutator( ) ); - return Apache::Geode::Client::Generic::AttributesMutator::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::AttributesMutator::Create( nativeptr.ptr( ) ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } generic - Apache::Geode::Client::Generic::CacheStatistics^ LocalRegion::Statistics::get() + Apache::Geode::Client::CacheStatistics^ LocalRegion::Statistics::get() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::CacheStatisticsPtr& nativeptr( NativePtr->getStatistics( ) ); - return Apache::Geode::Client::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::CacheStatistics::Create( nativeptr.ptr( ) ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } @@ -601,7 +600,7 @@ namespace Generic generic IRegion^ LocalRegion::CreateSubRegion( String^ subRegionName, - Apache::Geode::Client::Generic::RegionAttributes^ attributes) + Apache::Geode::Client::RegionAttributes^ attributes) { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ @@ -686,11 +685,11 @@ namespace Generic if(realCache != NULL) { - return Apache::Geode::Client::Generic::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) ); + return Apache::Geode::Client::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) ); } else { - return Apache::Geode::Client::Generic::AuthenticatedCache::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::AuthenticatedCache::Create( nativeptr.ptr( ) ); } _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ @@ -819,7 +818,7 @@ namespace Generic IRegion^ LocalRegion::GetLocalView() { throw gcnew System::NotSupportedException; - } - } - } -} } //namespace + } // namespace Client + } // namespace Geode +} // namespace Apache + } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/LocalRegion.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/LocalRegion.hpp b/src/clicache/src/LocalRegion.hpp index e01308e..cdd40c5 100644 --- a/src/clicache/src/LocalRegion.hpp +++ b/src/clicache/src/LocalRegion.hpp @@ -34,8 +34,7 @@ namespace Apache { namespace Client { -namespace Generic - { + generic ref class RegionEntry; @@ -43,7 +42,7 @@ namespace Generic ref class AttributesMutator; generic - public ref class LocalRegion : public Generic::Internal::SBWrap, public IRegion + public ref class LocalRegion : public Client::Internal::SBWrap, public IRegion { public: @@ -166,12 +165,12 @@ namespace Generic virtual property AttributesMutator^ AttributesMutator { - Apache::Geode::Client::Generic::AttributesMutator^ get(); + Apache::Geode::Client::AttributesMutator^ get(); } - virtual property Apache::Geode::Client::Generic::CacheStatistics^ Statistics + virtual property Apache::Geode::Client::CacheStatistics^ Statistics { - Apache::Geode::Client::Generic::CacheStatistics^ get(); + Apache::Geode::Client::CacheStatistics^ get(); } virtual IRegion^ GetSubRegion( String^ path ); @@ -185,9 +184,9 @@ namespace Generic virtual System::Collections::Generic::ICollection^>^ GetEntries(bool recursive); - virtual property Apache::Geode::Client::Generic::IRegionService^ RegionService + virtual property Apache::Geode::Client::IRegionService^ RegionService { - Apache::Geode::Client::Generic::IRegionService^ get( ); + Apache::Geode::Client::IRegionService^ get( ); } virtual bool ContainsValueForKey( TKey key ); @@ -244,8 +243,7 @@ namespace Generic inline apache::geode::client::SerializablePtr getRegionEntryValue(apache::geode::client::CacheableKeyPtr& key); bool AreValuesEqual(apache::geode::client::CacheablePtr& val1, apache::geode::client::CacheablePtr& val2); }; + } // namespace Client + } // namespace Geode +} // namespace Apache - - } - } -} } //namespace http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Log.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Log.cpp b/src/clicache/src/Log.cpp index 683a9bd..08707f6 100644 --- a/src/clicache/src/Log.cpp +++ b/src/clicache/src/Log.cpp @@ -30,8 +30,7 @@ namespace Apache { namespace Client { -namespace Generic - { + void Log::Init( LogLevel level, String^ logFileName ) { _GF_MG_EXCEPTION_TRY2 @@ -117,9 +116,9 @@ namespace Generic "GemFire exception {0} caught: {1}{2}{3}", ex->GetType( ), ex->Message, Environment::NewLine, msg ); Log::Write( level, logMsg ); - } - } - } // end namespace generic - } + } // namespace Client + } // namespace Geode +} // namespace Apache + } }