From 69f7cb9846603fd414c827768ec3dc673c422130 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Thu, 23 Jan 2014 16:22:38 -0500 Subject: [PATCH] Fix warnings in headers because application/user settings control what warnings are seen when compiling against poco --- Foundation/include/Poco/ActiveStarter.h | 2 +- Foundation/include/Poco/BufferAllocator.h | 2 +- Foundation/include/Poco/BufferedBidirectionalStreamBuf.h | 4 ++-- Foundation/include/Poco/BufferedStreamBuf.h | 4 ++-- Foundation/include/Poco/FunctionDelegate.h | 4 ++-- Foundation/include/Poco/MemoryStream.h | 2 +- Foundation/include/Poco/MetaObject.h | 2 +- Foundation/include/Poco/RotateStrategy.h | 2 +- Foundation/include/Poco/Void.h | 4 ++-- JSON/include/Poco/JSON/Object.h | 8 ++++---- JSON/src/Object.cpp | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Foundation/include/Poco/ActiveStarter.h b/Foundation/include/Poco/ActiveStarter.h index ff036c766..72b87b885 100644 --- a/Foundation/include/Poco/ActiveStarter.h +++ b/Foundation/include/Poco/ActiveStarter.h @@ -56,7 +56,7 @@ class ActiveStarter /// thread pool. { public: - static void start(OwnerType* pOwner, ActiveRunnableBase::Ptr pRunnable) + static void start(OwnerType* /*pOwner*/, ActiveRunnableBase::Ptr pRunnable) { ThreadPool::defaultPool().start(*pRunnable); pRunnable->duplicate(); // The runnable will release itself. diff --git a/Foundation/include/Poco/BufferAllocator.h b/Foundation/include/Poco/BufferAllocator.h index dece69b4c..6cc4afa9a 100644 --- a/Foundation/include/Poco/BufferAllocator.h +++ b/Foundation/include/Poco/BufferAllocator.h @@ -61,7 +61,7 @@ public: return new char_type[static_cast(size)]; } - static void deallocate(char_type* ptr, std::streamsize size) + static void deallocate(char_type* ptr, std::streamsize /*size*/) { delete [] ptr; } diff --git a/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h b/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h index 4730509b1..f660c8dbf 100644 --- a/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h +++ b/Foundation/include/Poco/BufferedBidirectionalStreamBuf.h @@ -153,12 +153,12 @@ protected: } private: - virtual int readFromDevice(char_type* buffer, std::streamsize length) + virtual int readFromDevice(char_type* /*buffer*/, std::streamsize /*length*/) { return 0; } - virtual int writeToDevice(const char_type* buffer, std::streamsize length) + virtual int writeToDevice(const char_type* /*buffer*/, std::streamsize /*length*/) { return 0; } diff --git a/Foundation/include/Poco/BufferedStreamBuf.h b/Foundation/include/Poco/BufferedStreamBuf.h index f4cd31e91..10da4679c 100644 --- a/Foundation/include/Poco/BufferedStreamBuf.h +++ b/Foundation/include/Poco/BufferedStreamBuf.h @@ -146,12 +146,12 @@ protected: } private: - virtual int readFromDevice(char_type* buffer, std::streamsize length) + virtual int readFromDevice(char_type* /*buffer*/, std::streamsize /*length*/) { return 0; } - virtual int writeToDevice(const char_type* buffer, std::streamsize length) + virtual int writeToDevice(const char_type* /*buffer*/, std::streamsize /*length*/) { return 0; } diff --git a/Foundation/include/Poco/FunctionDelegate.h b/Foundation/include/Poco/FunctionDelegate.h index cb7c20d79..eadf020ea 100644 --- a/Foundation/include/Poco/FunctionDelegate.h +++ b/Foundation/include/Poco/FunctionDelegate.h @@ -217,7 +217,7 @@ public: return *this; } - bool notify(const void* sender, TArgs& arguments) + bool notify(const void* /*sender*/, TArgs& arguments) { Mutex::ScopedLock lock(_mutex); if (_receiverMethod) @@ -427,7 +427,7 @@ public: return *this; } - bool notify(const void* sender) + bool notify(const void* /*sender*/) { Mutex::ScopedLock lock(_mutex); if (_receiverMethod) diff --git a/Foundation/include/Poco/MemoryStream.h b/Foundation/include/Poco/MemoryStream.h index 047a550a4..bb1834a3f 100644 --- a/Foundation/include/Poco/MemoryStream.h +++ b/Foundation/include/Poco/MemoryStream.h @@ -84,7 +84,7 @@ public: { } - virtual int_type overflow(int_type c) + virtual int_type overflow(int_type /*c*/) { return char_traits::eof(); } diff --git a/Foundation/include/Poco/MetaObject.h b/Foundation/include/Poco/MetaObject.h index 971828295..f24ee5c57 100644 --- a/Foundation/include/Poco/MetaObject.h +++ b/Foundation/include/Poco/MetaObject.h @@ -207,7 +207,7 @@ public: return *_object.get(); } - bool isAutoDelete(B* pObject) const + bool isAutoDelete(B* /*pObject*/) const { return true; } diff --git a/Foundation/include/Poco/RotateStrategy.h b/Foundation/include/Poco/RotateStrategy.h index 5fa61e384..be55f8c02 100644 --- a/Foundation/include/Poco/RotateStrategy.h +++ b/Foundation/include/Poco/RotateStrategy.h @@ -114,7 +114,7 @@ public: { } - bool mustRotate(LogFile* pFile) + bool mustRotate(LogFile* /*pFile*/) { if (DT() >= _threshold) { diff --git a/Foundation/include/Poco/Void.h b/Foundation/include/Poco/Void.h index 6590d7dc9..0b1a20f5f 100644 --- a/Foundation/include/Poco/Void.h +++ b/Foundation/include/Poco/Void.h @@ -77,13 +77,13 @@ public: }; -inline bool Void::operator ==(const Void& v) const +inline bool Void::operator ==(const Void& /*v*/) const { return true; } -inline bool Void::operator !=(const Void& v) const +inline bool Void::operator !=(const Void& /*v*/) const { return false; } diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index 5365bf72f..9588da40d 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -229,7 +229,7 @@ public: private: template - void doStringify(const C& container, std::ostream& out, unsigned int indent, int step) const + void doStringify(const C& container, std::ostream& out, unsigned int indent, unsigned int step) const { out << '{'; @@ -239,7 +239,7 @@ private: typename C::const_iterator end = container.end(); for (; it != end;) { - for(int i = 0; i < indent; i++) out << ' '; + for(unsigned int i = 0; i < indent; i++) out << ' '; out << '"' << getKey(it) << '"'; out << ((indent > 0) ? " : " : ":"); @@ -248,12 +248,12 @@ private: if ( ++it != container.end() ) out << ','; - if (step > 0) out << '\n'; + if (step > 0) out << std::endl; } if (indent >= step) indent -= step; - for (int i = 0; i < indent; i++) + for (unsigned int i = 0; i < indent; i++) out << ' '; out << '}'; diff --git a/JSON/src/Object.cpp b/JSON/src/Object.cpp index ce2ea5e47..a89e164c4 100644 --- a/JSON/src/Object.cpp +++ b/JSON/src/Object.cpp @@ -112,7 +112,7 @@ void Object::getNames(std::vector& names) const void Object::stringify(std::ostream& out, unsigned int indent, int step) const { - if (step == -1) step = indent; + if (step < 0) step = indent; if(!_preserveInsOrder) doStringify(_values, out, indent, step);