activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r598685 - in /activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio: Buffer.cpp Buffer.h ByteBuffer.cpp ByteBuffer.h
Date Tue, 27 Nov 2007 16:36:29 GMT
Author: tabish
Date: Tue Nov 27 08:36:28 2007
New Revision: 598685

URL: http://svn.apache.org/viewvc?rev=598685&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Starting the NIO implementation

Modified:
    activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.cpp
    activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.h
    activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.cpp
    activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.h

Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.cpp?rev=598685&r1=598684&r2=598685&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.cpp (original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.cpp Tue Nov 27 08:36:28 2007
@@ -29,7 +29,7 @@
     this->_limit = capacity;
     this->_position = 0;
     this->_mark = 0;
-    this->markSet = false;
+    this->_markSet = false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -43,9 +43,9 @@
     }
 
     this->_position = newPosition;
-    if( this->markSet && ( this->_mark > newPosition ) ) {
+    if( this->_markSet && ( this->_mark > newPosition ) ) {
         this->_mark = 0;
-        this->markSet = false;
+        this->_markSet = false;
     }
 
     return *this;
@@ -65,9 +65,9 @@
         this->_position = newLimit;
     }
 
-    if( this->markSet && ( this->_mark > newLimit ) ) {
+    if( this->_markSet && ( this->_mark > newLimit ) ) {
         this->_mark = 0;
-        this->markSet = false;
+        this->_markSet = false;
     }
 
     return *this;
@@ -77,7 +77,7 @@
 Buffer& Buffer::mark() {
 
     this->_mark = this->_position;
-    this->_mark = true;
+    this->_markSet = true;
 
     return *this;
 }
@@ -85,7 +85,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 Buffer& Buffer::reset() throw ( InvalidMarkException ) {
 
-    if( !this->markSet ) {
+    if( !this->_markSet ) {
         throw InvalidMarkException(
             __FILE__, __LINE__,
             "Buffer::reset - Buffer has not been Marked." );
@@ -101,7 +101,7 @@
 
     this->_position = 0;
     this->_mark = 0;
-    this->markSet = false;
+    this->_markSet = false;
     this->_limit = this->capacity();
     return *this;
 }
@@ -112,7 +112,7 @@
     this->_limit = this->_position;
     this->_position = 0;
     this->_mark = 0;
-    this->markSet = false;
+    this->_markSet = false;
     return *this;
 }
 
@@ -121,6 +121,6 @@
 
     this->_position = 0;
     this->_mark = 0;
-    this->markSet = false;
+    this->_markSet = false;
     return *this;
 }

Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.h?rev=598685&r1=598684&r2=598685&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.h (original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/Buffer.h Tue Nov 27 08:36:28 2007
@@ -128,7 +128,7 @@
         mutable std::size_t _position;
         std::size_t _limit;
         std::size_t _mark;
-        bool markSet;
+        bool _markSet;
 
     public:
 

Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.cpp?rev=598685&r1=598684&r2=598685&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.cpp (original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.cpp Tue Nov 27 08:36:28
2007
@@ -191,7 +191,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int ByteBuffer::arrayOffset() const
+std::size_t ByteBuffer::arrayOffset() const
     throw( ReadOnlyBufferException,
            lang::exceptions::UnsupportedOperationException ) {
 
@@ -486,7 +486,7 @@
 
         this->position( this->limit() - this->position() );
         this->limit( this->capacity() );
-        this->markSet = false;
+        this->_markSet = false;
 
         return *this;
     }

Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.h?rev=598685&r1=598684&r2=598685&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.h (original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ByteBuffer.h Tue Nov 27 08:36:28
2007
@@ -214,7 +214,7 @@
          * @throws UnsupportedOperationException - If this buffer is not backed by an
          * accessible array
          */
-        virtual int arrayOffset() const
+        virtual std::size_t arrayOffset() const
             throw( ReadOnlyBufferException,
                    lang::exceptions::UnsupportedOperationException );
 



Mime
View raw message