Fix some warnings.
diff --git a/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h b/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h
index 55fa94e..edeafd2 100644
--- a/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h
+++ b/activemq-cpp/src/test-benchmarks/benchmark/PerformanceTimer.h
@@ -63,7 +63,7 @@
* Gets the number of runs made so far
* @returns unsigned int that counts the number of runs
*/
- unsigned long long getNumberOfRuns() const {
+ long long getNumberOfRuns() const {
return numberOfRuns;
}
diff --git a/activemq-cpp/src/test-benchmarks/decaf/io/BufferedInputStreamBenchmark.cpp b/activemq-cpp/src/test-benchmarks/decaf/io/BufferedInputStreamBenchmark.cpp
index 5918e31..86057d1 100644
--- a/activemq-cpp/src/test-benchmarks/decaf/io/BufferedInputStreamBenchmark.cpp
+++ b/activemq-cpp/src/test-benchmarks/decaf/io/BufferedInputStreamBenchmark.cpp
@@ -33,40 +33,38 @@
////////////////////////////////////////////////////////////////////////////////
void BufferedInputStreamBenchmark::setUp() {
-
buffer = new unsigned char[bufferSize];
- source.setByteArray( buffer, bufferSize );
+ source.setByteArray(buffer, bufferSize);
}
////////////////////////////////////////////////////////////////////////////////
-void BufferedInputStreamBenchmark::tearDown(){
+void BufferedInputStreamBenchmark::tearDown() {
- delete [] buffer;
+ delete[] buffer;
}
////////////////////////////////////////////////////////////////////////////////
-void BufferedInputStreamBenchmark::run(){
+void BufferedInputStreamBenchmark::run() {
int numRuns = 25;
- std::vector<unsigned char> bucket( bufferSize );
- BufferedInputStream bis( &source );
+ std::vector<unsigned char> bucket(bufferSize);
+ BufferedInputStream bis(&source);
- for( int iy = 0; iy < numRuns; ++iy ){
- BufferedInputStream local( &source );
+ for (std::size_t iy = 0; iy < numRuns; ++iy) {
+ BufferedInputStream local(&source);
}
- for( int iy = 0; iy < numRuns; ++iy ){
+ for (std::size_t iy = 0; iy < numRuns; ++iy) {
- for( int iz = 0; iz < bufferSize; ++iz ) {
- bucket[iy] = (unsigned char)bis.read();
+ for (int iz = 0; iz < bufferSize; ++iz) {
+ bucket[iy] = (unsigned char) bis.read();
}
source.reset();
}
- for( int iy = 0; iy < numRuns; ++iy ){
- bis.read( &bucket[0], bufferSize, 0, bufferSize );
+ for (std::size_t iy = 0; iy < numRuns; ++iy) {
+ bis.read(&bucket[0], bufferSize, 0, bufferSize);
source.reset();
}
-
}
diff --git a/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp b/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp
index c6f2d9e..c0d824c 100755
--- a/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp
+++ b/activemq-cpp/src/test-benchmarks/decaf/io/ByteArrayInputStreamBenchmark.cpp
@@ -37,12 +37,12 @@
buffer = new unsigned char[bufferSize];
// init to full String Buffer
- stlBuffer.reserve( bufferSize );
- for( int ix = 0; ix < bufferSize - 1; ++ix ) {
+ stlBuffer.reserve(bufferSize);
+ for (int ix = 0; ix < bufferSize - 1; ++ix) {
buffer[ix] = 65;
- stlBuffer.push_back( 65 );
+ stlBuffer.push_back(65);
}
- buffer[bufferSize-1] = 0;
+ buffer[bufferSize - 1] = 0;
}
////////////////////////////////////////////////////////////////////////////////
@@ -52,28 +52,27 @@
}
////////////////////////////////////////////////////////////////////////////////
-void ByteArrayInputStreamBenchmark::run(){
+void ByteArrayInputStreamBenchmark::run() {
int numRuns = 25;
- std::vector<unsigned char> bucket( bufferSize );
- ByteArrayInputStream bis( buffer, bufferSize );
+ std::vector<unsigned char> bucket(bufferSize);
+ ByteArrayInputStream bis(buffer, bufferSize);
- for( int iy = 0; iy < numRuns; ++iy ){
- ByteArrayInputStream local( buffer, bufferSize );
+ for (int iy = 0; iy < numRuns; ++iy) {
+ ByteArrayInputStream local(buffer, bufferSize);
}
- for( int iy = 0; iy < numRuns; ++iy ){
+ for (std::size_t iy = 0; iy < numRuns; ++iy) {
- for( int iz = 0; iz < bufferSize; ++iz ) {
- bucket[iy] = (unsigned char)bis.read();
+ for (std::size_t iz = 0; iz < bufferSize; ++iz) {
+ bucket[iy] = (unsigned char) bis.read();
}
bis.reset();
}
- for( int iy = 0; iy < numRuns; ++iy ){
- bis.read( &bucket[0], bufferSize, 0, bufferSize );
+ for (std::size_t iy = 0; iy < numRuns; ++iy) {
+ bis.read(&bucket[0], bufferSize, 0, bufferSize);
bis.reset();
}
-
}
diff --git a/activemq-cpp/src/test-benchmarks/decaf/io/DataInputStreamBenchmark.cpp b/activemq-cpp/src/test-benchmarks/decaf/io/DataInputStreamBenchmark.cpp
index f9cf9be..4f8b9b7 100644
--- a/activemq-cpp/src/test-benchmarks/decaf/io/DataInputStreamBenchmark.cpp
+++ b/activemq-cpp/src/test-benchmarks/decaf/io/DataInputStreamBenchmark.cpp
@@ -29,28 +29,28 @@
}
////////////////////////////////////////////////////////////////////////////////
-void DataInputStreamBenchmark::setUp(){
+void DataInputStreamBenchmark::setUp() {
buffer = new unsigned char[bufferSize];
// init to full String Buffer
- for( int ix = 0; ix < bufferSize - 1; ++ix ) {
+ for (int ix = 0; ix < bufferSize - 1; ++ix) {
buffer[ix] = 65;
}
- buffer[bufferSize-1] = 0;
- bis.setByteArray( buffer, bufferSize );
+ buffer[bufferSize - 1] = 0;
+ bis.setByteArray(buffer, bufferSize);
}
////////////////////////////////////////////////////////////////////////////////
-void DataInputStreamBenchmark::tearDown(){
+void DataInputStreamBenchmark::tearDown() {
- delete [] buffer;
+ delete[] buffer;
}
////////////////////////////////////////////////////////////////////////////////
-void DataInputStreamBenchmark::run(){
+void DataInputStreamBenchmark::run() {
- DataInputStream dis( &bis );
+ DataInputStream dis(&bis);
bool boolResult = 0;
char charResult = 0;
@@ -63,52 +63,52 @@
float floatResult = 0.0f;
std::string stringResult = "";
- for( size_t iy = 0; iy < bufferSize / sizeof( boolResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(boolResult); ++iy) {
boolResult = dis.readBoolean();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( charResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(charResult); ++iy) {
charResult = dis.readChar();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( byteResult ); ++iy ){
- byteResult = dis.readByte();
+ for (size_t iy = 0; iy < bufferSize / sizeof(byteResult); ++iy) {
+ byteResult = (unsigned char) dis.readByte();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( ushortResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(ushortResult); ++iy) {
ushortResult = dis.readUnsignedShort();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( shortResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(shortResult); ++iy) {
shortResult = dis.readShort();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( intResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(intResult); ++iy) {
intResult = dis.readInt();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( longResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(longResult); ++iy) {
longResult = dis.readLong();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( floatResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(floatResult); ++iy) {
floatResult = dis.readFloat();
}
bis.reset();
- for( size_t iy = 0; iy < bufferSize / sizeof( doubleResult ); ++iy ){
+ for (size_t iy = 0; iy < bufferSize / sizeof(doubleResult); ++iy) {
doubleResult = dis.readDouble();
}
bis.reset();
- for( int i = 0; i < 5; ++i ) {
+ for (int i = 0; i < 5; ++i) {
stringResult = dis.readString();
bis.reset();
}
diff --git a/activemq-cpp/src/test-benchmarks/decaf/io/DataOutputStreamBenchmark.cpp b/activemq-cpp/src/test-benchmarks/decaf/io/DataOutputStreamBenchmark.cpp
index d64bc50..9b799d1 100644
--- a/activemq-cpp/src/test-benchmarks/decaf/io/DataOutputStreamBenchmark.cpp
+++ b/activemq-cpp/src/test-benchmarks/decaf/io/DataOutputStreamBenchmark.cpp
@@ -27,55 +27,55 @@
}
////////////////////////////////////////////////////////////////////////////////
-void DataOutputStreamBenchmark::setUp(){
+void DataOutputStreamBenchmark::setUp() {
- for( size_t i = 0; i < 8096; ++i ) {
+ for (size_t i = 0; i < 8096; ++i) {
testString += 'a';
}
}
////////////////////////////////////////////////////////////////////////////////
-void DataOutputStreamBenchmark::run(){
+void DataOutputStreamBenchmark::run() {
int numRuns = 500;
ByteArrayOutputStream bos;
- DataOutputStream dos( &bos );
+ DataOutputStream dos(&bos);
- for( int iy = 0; iy < numRuns * 40; ++iy ){
- dos.writeLong( 0xFF00FF00FF00FF00LL );
+ for (int iy = 0; iy < numRuns * 40; ++iy) {
+ dos.writeLong((long long) 0xFF00FF00FF00FF00LL);
}
- for( int iy = 0; iy < numRuns * 40; ++iy ){
- dos.writeInt( 312568 );
+ for (int iy = 0; iy < numRuns * 40; ++iy) {
+ dos.writeInt(312568);
}
- for( int iy = 0; iy < numRuns * 40; ++iy ){
- dos.writeShort( 12568 );
+ for (int iy = 0; iy < numRuns * 40; ++iy) {
+ dos.writeShort(12568);
}
- for( int iy = 0; iy < numRuns * 40; ++iy ){
- dos.writeUnsignedShort( 12568 );
+ for (int iy = 0; iy < numRuns * 40; ++iy) {
+ dos.writeUnsignedShort(12568);
}
- for( int iy = 0; iy < numRuns * 40; ++iy ){
- dos.writeBoolean( true );
+ for (int iy = 0; iy < numRuns * 40; ++iy) {
+ dos.writeBoolean(true);
}
- for( int iy = 0; iy < numRuns * 40; ++iy ){
- dos.writeDouble( 10.34235234 );
+ for (int iy = 0; iy < numRuns * 40; ++iy) {
+ dos.writeDouble(10.34235234);
}
- for( int iy = 0; iy < numRuns + 40; ++iy ){
- dos.writeFloat( 32.4f );
+ for (int iy = 0; iy < numRuns + 40; ++iy) {
+ dos.writeFloat(32.4f);
}
bos.reset();
- for( int iy = 0; iy < numRuns; ++iy ){
- dos.writeChars( testString );
+ for (int iy = 0; iy < numRuns; ++iy) {
+ dos.writeChars(testString);
bos.reset();
}
- for( int iy = 0; iy < numRuns; ++iy ){
- dos.writeBytes( testString );
+ for (int iy = 0; iy < numRuns; ++iy) {
+ dos.writeBytes(testString);
bos.reset();
}
- for( int iy = 0; iy < numRuns; ++iy ){
- dos.writeUTF( testString );
+ for (int iy = 0; iy < numRuns; ++iy) {
+ dos.writeUTF(testString);
bos.reset();
}
