Author: tabish
Date: Mon Mar 8 19:38:02 2010
New Revision: 920477
URL: http://svn.apache.org/viewvc?rev=920477&view=rev
Log:
Add missing files to Windows Project and fix some compiler warnings as well as
a test failure.
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/zip/trees.c
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/zip/trees.c
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/zip/trees.c?rev=920477&r1=920476&r2=920477&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/zip/trees.c
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/util/zip/trees.c
Mon Mar 8 19:38:02 2010
@@ -39,6 +39,10 @@
# include <ctype.h>
#endif
+#ifdef WIN32
+#pragma warning( disable : 4267 )
+#endif
+
/* ===========================================================================
* Constants
*/
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp?rev=920477&r1=920476&r2=920477&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/DataInputStreamTest.cpp
Mon Mar 8 19:38:02 2010
@@ -484,8 +484,8 @@
}
try{
- std::vector<unsigned char> buffer2;
- reader.readFully( &buffer2[0], buffer2.size() );
+ unsigned char buffer2[1];
+ reader.readFully( buffer2, 0 );
} catch(...){
CPPUNIT_ASSERT( false );
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj?rev=920477&r1=920476&r2=920477&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/vs2005-build/vs2005-activemq.vcproj
Mon Mar 8 19:38:02 2010
@@ -22783,6 +22783,10 @@
>
</File>
<File
+
RelativePath="..\src\main\decaf\internal\util\zip\inflate.c"
+ >
+ </File>
+ <File
RelativePath="..\src\main\decaf\internal\util\zip\inflate.h"
>
</File>
