Author: nmittler
Date: Tue Jan 1 10:05:11 2008
New Revision: 607883
URL: http://svn.apache.org/viewvc?rev=607883&view=rev
Log:
fix build on os x
Modified:
activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/CharBuffer.cpp
activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/DoubleBuffer.cpp
activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/FloatBuffer.cpp
activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/IntBuffer.cpp
activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/LongBuffer.cpp
activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ShortBuffer.cpp
Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/CharBuffer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/CharBuffer.cpp?rev=607883&r1=607882&r2=607883&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/CharBuffer.cpp
(original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/CharBuffer.cpp Tue Jan
1 10:05:11 2008
@@ -388,7 +388,9 @@
return target->remaining() == 0 ? 0 : string::npos;
}
- std::size_t result = Math::min( target->remaining(), this->remaining()
);
+ std::size_t result = (std::size_t)Math::min(
+ (int)target->remaining(),
+ (int)this->remaining() );
char* chars = new char[result];
get( chars, 0, result );
target->put( chars, 0, result );
@@ -405,7 +407,7 @@
////////////////////////////////////////////////////////////////////////////////
int CharBuffer::compareTo( const CharBuffer& value ) const {
- int compareRemaining = Math::min( remaining(), value.remaining() );
+ int compareRemaining = Math::min( (int)remaining(), (int)value.remaining()
);
std::size_t thisPos = this->position();
std::size_t otherPos = value.position();
Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/DoubleBuffer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/DoubleBuffer.cpp?rev=607883&r1=607882&r2=607883&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/DoubleBuffer.cpp
(original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/DoubleBuffer.cpp Tue
Jan 1 10:05:11 2008
@@ -247,7 +247,7 @@
////////////////////////////////////////////////////////////////////////////////
int DoubleBuffer::compareTo( const DoubleBuffer& value ) const {
- int compareRemaining = Math::min( remaining(), value.remaining() );
+ int compareRemaining = Math::min( (int)remaining(), (int)value.remaining()
);
std::size_t thisPos = this->position();
std::size_t otherPos = value.position();
Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/FloatBuffer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/FloatBuffer.cpp?rev=607883&r1=607882&r2=607883&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/FloatBuffer.cpp
(original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/FloatBuffer.cpp Tue
Jan 1 10:05:11 2008
@@ -247,7 +247,7 @@
////////////////////////////////////////////////////////////////////////////////
int FloatBuffer::compareTo( const FloatBuffer& value ) const {
- int compareRemaining = Math::min( remaining(), value.remaining() );
+ int compareRemaining = Math::min( (int)remaining(), (int)value.remaining()
);
std::size_t thisPos = this->position();
std::size_t otherPos = value.position();
Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/IntBuffer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/IntBuffer.cpp?rev=607883&r1=607882&r2=607883&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/IntBuffer.cpp
(original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/IntBuffer.cpp Tue Jan
1 10:05:11 2008
@@ -247,7 +247,7 @@
////////////////////////////////////////////////////////////////////////////////
int IntBuffer::compareTo( const IntBuffer& value ) const {
- int compareRemaining = Math::min( remaining(), value.remaining() );
+ int compareRemaining = Math::min( (int)remaining(), (int)value.remaining()
);
std::size_t thisPos = this->position();
std::size_t otherPos = value.position();
Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/LongBuffer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/LongBuffer.cpp?rev=607883&r1=607882&r2=607883&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/LongBuffer.cpp
(original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/LongBuffer.cpp Tue Jan
1 10:05:11 2008
@@ -247,7 +247,7 @@
////////////////////////////////////////////////////////////////////////////////
int LongBuffer::compareTo( const LongBuffer& value ) const {
- std::size_t compareRemaining = Math::min( remaining(), value.remaining() );
+ std::size_t compareRemaining = (std::size_t)Math::min( (int)remaining(),
(int)value.remaining() );
std::size_t thisPos = this->position();
std::size_t otherPos = value.position();
Modified: activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ShortBuffer.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ShortBuffer.cpp?rev=607883&r1=607882&r2=607883&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ShortBuffer.cpp
(original)
+++ activemq/activemq-cpp/decaf/trunk/src/main/decaf/nio/ShortBuffer.cpp Tue
Jan 1 10:05:11 2008
@@ -247,7 +247,7 @@
////////////////////////////////////////////////////////////////////////////////
int ShortBuffer::compareTo( const ShortBuffer& value ) const {
- int compareRemaining = Math::min( remaining(), value.remaining() );
+ int compareRemaining = Math::min( (int)remaining(), (int)value.remaining()
);
std::size_t thisPos = this->position();
std::size_t otherPos = value.position();
