diff options
| author | Jose <jose@zeroc.com> | 2013-01-11 00:37:06 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-11 00:37:06 +0100 |
| commit | 047677f816eb972a75213f3ed62dfc03368c2736 (patch) | |
| tree | 93b55e4a0a749515d10b79a911929fef14154fb7 /cpp | |
| parent | OS X installer relocation issues (diff) | |
| download | ice-047677f816eb972a75213f3ed62dfc03368c2736.tar.bz2 ice-047677f816eb972a75213f3ed62dfc03368c2736.tar.xz ice-047677f816eb972a75213f3ed62dfc03368c2736.zip | |
Fixed (ICE-5181) - unreferenced formal parameter
Diffstat (limited to 'cpp')
306 files changed, 739 insertions, 589 deletions
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index bb80602f89e..228e07089a1 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -27,7 +27,7 @@ PRELIBPATH = /LIBPATH: GENERATE_PDB = yes !endif -CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc +CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -w34100 -w34189 -EHsc ARFLAGS = $(ARFLAGS) -nologo -WX !if "$(WINRT)" == "yes" diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 91414d56ae4..67095e45dfb 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -696,7 +696,7 @@ public: typedef IceUtil::Handle<MyFactory> MyFactoryPtr; int -TestApp::run(int argc, char* argv[]) +TestApp::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Freeze/casino/Client.cpp b/cpp/demo/Freeze/casino/Client.cpp index a9a1ceb5eeb..9315d98458a 100644 --- a/cpp/demo/Freeze/casino/Client.cpp +++ b/cpp/demo/Freeze/casino/Client.cpp @@ -39,7 +39,7 @@ main(int argc, char* argv[]) } int -CasinoClient::run(int argc, char* argv[]) +CasinoClient::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Freeze/casino/Server.cpp b/cpp/demo/Freeze/casino/Server.cpp index 1ae1b9ed42c..4f3f7c64e17 100644 --- a/cpp/demo/Freeze/casino/Server.cpp +++ b/cpp/demo/Freeze/casino/Server.cpp @@ -51,7 +51,7 @@ class ObjectFactory : public Ice::ObjectFactory public: virtual Ice::ObjectPtr - create(const string& type) + create(const string& /*type*/) { return new T; } @@ -63,7 +63,7 @@ public: }; int -CasinoServer::run(int argc, char* argv[]) +CasinoServer::run(int argc, char*[]) { if(argc > 1) { @@ -115,7 +115,7 @@ CasinoServer::run(int argc, char* argv[]) } virtual void - initialize(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& identity, const string& facet, + initialize(const Ice::ObjectAdapterPtr& /*adapter*/, const Ice::Identity& /*identity*/, const string& /*facet*/, const Ice::ObjectPtr& servant) { BankI* bank = dynamic_cast<BankI*>(servant.get()); @@ -154,7 +154,7 @@ CasinoServer::run(int argc, char* argv[]) } virtual void - initialize(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& identity, const string& facet, + initialize(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& identity, const string& /*facet*/, const Ice::ObjectPtr& servant) { CasinoStore::PersistentPlayerPrx prx = @@ -195,7 +195,7 @@ CasinoServer::run(int argc, char* argv[]) } virtual void - initialize(const Ice::ObjectAdapterPtr& adapter, const Ice::Identity& identity, const string& facet, + initialize(const Ice::ObjectAdapterPtr& /*adapter*/, const Ice::Identity& /*identity*/, const string& /*facet*/, const Ice::ObjectPtr& servant) { BetI* bet = dynamic_cast<BetI*>(servant.get()); diff --git a/cpp/demo/Freeze/customEvictor/Client.cpp b/cpp/demo/Freeze/customEvictor/Client.cpp index e340aec325f..8a971efea15 100644 --- a/cpp/demo/Freeze/customEvictor/Client.cpp +++ b/cpp/demo/Freeze/customEvictor/Client.cpp @@ -141,7 +141,7 @@ private: typedef IceUtil::Handle<WriterThread> WriterThreadPtr; int -WarehouseClient::run(int argc, char* argv[]) +WarehouseClient::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Freeze/customEvictor/Evictor.cpp b/cpp/demo/Freeze/customEvictor/Evictor.cpp index d05e13038a0..8147beefaf4 100644 --- a/cpp/demo/Freeze/customEvictor/Evictor.cpp +++ b/cpp/demo/Freeze/customEvictor/Evictor.cpp @@ -182,7 +182,7 @@ Evictor::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie) } void -Evictor::finished(const Ice::Current& current, const Ice::ObjectPtr& servant, +Evictor::finished(const Ice::Current& /*current*/, const Ice::ObjectPtr& /*servant*/, const Ice::LocalObjectPtr& cookie) { if(cookie != 0) @@ -200,7 +200,7 @@ Evictor::finished(const Ice::Current& current, const Ice::ObjectPtr& servant, } void -Evictor::deactivate(const string& category) +Evictor::deactivate(const string& /*category*/) { Mutex::Lock lock(_mutex); _size = 0; diff --git a/cpp/demo/Freeze/customEvictor/EvictorBase.cpp b/cpp/demo/Freeze/customEvictor/EvictorBase.cpp index d07e6bfd83d..f2713c5daf3 100644 --- a/cpp/demo/Freeze/customEvictor/EvictorBase.cpp +++ b/cpp/demo/Freeze/customEvictor/EvictorBase.cpp @@ -79,7 +79,7 @@ EvictorBase::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::Loc } void -EvictorBase::deactivate(const std::string& category) +EvictorBase::deactivate(const std::string& /*category*/) { IceUtil::Mutex::Lock lock(_mutex); diff --git a/cpp/demo/Freeze/library/BookFactory.cpp b/cpp/demo/Freeze/library/BookFactory.cpp index b51dab75fa8..dec916ed77a 100644 --- a/cpp/demo/Freeze/library/BookFactory.cpp +++ b/cpp/demo/Freeze/library/BookFactory.cpp @@ -17,7 +17,11 @@ BookFactory::BookFactory(const LibraryIPtr& library) : } Ice::ObjectPtr +#ifndef NDEBUG BookFactory::create(const string& type) +#else +BookFactory::create(const string&) +#endif { assert(_library); assert(type == "::Demo::Book"); diff --git a/cpp/demo/Freeze/library/RunParser.cpp b/cpp/demo/Freeze/library/RunParser.cpp index 52b64bee3f4..979aabcd155 100644 --- a/cpp/demo/Freeze/library/RunParser.cpp +++ b/cpp/demo/Freeze/library/RunParser.cpp @@ -14,7 +14,7 @@ using namespace std; using namespace Demo; int -runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +runParser(int, char* argv[], const Ice::CommunicatorPtr& communicator) { LibraryPrx library = LibraryPrx::checkedCast(communicator->propertyToProxy("Library.Proxy")); if(!library) diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp index 018862d4c97..242a5da3f05 100644 --- a/cpp/demo/Freeze/library/Server.cpp +++ b/cpp/demo/Freeze/library/Server.cpp @@ -37,7 +37,7 @@ main(int argc, char* argv[]) } int -LibraryServer::run(int argc, char* argv[]) +LibraryServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Freeze/phonebook/ContactFactory.cpp b/cpp/demo/Freeze/phonebook/ContactFactory.cpp index 45c65754587..9be41b1cfd4 100644 --- a/cpp/demo/Freeze/phonebook/ContactFactory.cpp +++ b/cpp/demo/Freeze/phonebook/ContactFactory.cpp @@ -17,7 +17,11 @@ ContactFactory::ContactFactory() } Ice::ObjectPtr +#ifndef NDEBUG ContactFactory::create(const string& type) +#else +ContactFactory::create(const string&) +#endif { assert(_evictor); assert(type == "::Demo::Contact"); diff --git a/cpp/demo/Freeze/phonebook/RunParser.cpp b/cpp/demo/Freeze/phonebook/RunParser.cpp index f1dc313e6a4..188d084aa65 100644 --- a/cpp/demo/Freeze/phonebook/RunParser.cpp +++ b/cpp/demo/Freeze/phonebook/RunParser.cpp @@ -14,7 +14,7 @@ using namespace std; using namespace Demo; int -runParser(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +runParser(int, char* argv[], const Ice::CommunicatorPtr& communicator) { PhoneBookPrx phoneBook = PhoneBookPrx::checkedCast(communicator->propertyToProxy("PhoneBook.Proxy")); if(!phoneBook) diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp index 6e916dbe2e8..7de451c62df 100644 --- a/cpp/demo/Freeze/phonebook/Server.cpp +++ b/cpp/demo/Freeze/phonebook/Server.cpp @@ -38,7 +38,7 @@ main(int argc, char* argv[]) } int -PhoneBookServer::run(int argc, char* argv[]) +PhoneBookServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Freeze/transform/create.cpp b/cpp/demo/Freeze/transform/create.cpp index 4ee750e51a8..34e3f2789fe 100644 --- a/cpp/demo/Freeze/transform/create.cpp +++ b/cpp/demo/Freeze/transform/create.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) } int -Create::run(int argc, char* argv[]) +Create::run(int, char*[]) { const string names[] = { "don", "ed", "frank", "gary", "arnold", "bob", "carlos" }; const string phoneNumbers[] = { "(777)777-7777", "(666)666-6666", "(555)555-5555 x123", diff --git a/cpp/demo/Freeze/transform/read.cpp b/cpp/demo/Freeze/transform/read.cpp index 94feb8514ea..220dfb60527 100644 --- a/cpp/demo/Freeze/transform/read.cpp +++ b/cpp/demo/Freeze/transform/read.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) } int -Read::run(int argc, char* argv[]) +Read::run(int, char*[]) { ConnectionPtr connection = createConnection(communicator(), "db"); const Contacts contacts(connection, "contacts", false); diff --git a/cpp/demo/Freeze/transform/readnew.cpp b/cpp/demo/Freeze/transform/readnew.cpp index 8ae1925aa11..7dc45079c1d 100644 --- a/cpp/demo/Freeze/transform/readnew.cpp +++ b/cpp/demo/Freeze/transform/readnew.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) } int -ReadNew::run(int argc, char* argv[]) +ReadNew::run(int, char*[]) { ConnectionPtr connection = createConnection(communicator(), "dbnew"); bool createDb = true; diff --git a/cpp/demo/Freeze/transform/recreate.cpp b/cpp/demo/Freeze/transform/recreate.cpp index fa9adeda525..e9c13403f7f 100644 --- a/cpp/demo/Freeze/transform/recreate.cpp +++ b/cpp/demo/Freeze/transform/recreate.cpp @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) } int -Recreate::run(int argc, char* argv[]) +Recreate::run(int, char*[]) { ConnectionPtr connection = createConnection(communicator(), "dbnew"); NewContacts::recreate(connection, "contacts"); diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp index 4c736cc16bb..7353cef2c88 100644 --- a/cpp/demo/Glacier2/callback/Client.cpp +++ b/cpp/demo/Glacier2/callback/Client.cpp @@ -93,7 +93,7 @@ CallbackClient::createSession() } int -CallbackClient::runWithSession(int argc, char* argv[]) +CallbackClient::runWithSession(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Glacier2/callback/Server.cpp b/cpp/demo/Glacier2/callback/Server.cpp index 567709a94ed..fe40961831a 100644 --- a/cpp/demo/Glacier2/callback/Server.cpp +++ b/cpp/demo/Glacier2/callback/Server.cpp @@ -28,7 +28,7 @@ main(int argc, char* argv[]) } int -CallbackServer::run(int argc, char* argv[]) +CallbackServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp index 27c63d2247e..4905b577962 100644 --- a/cpp/demo/Glacier2/chat/Client.cpp +++ b/cpp/demo/Glacier2/chat/Client.cpp @@ -87,7 +87,7 @@ public: } virtual int - runWithSession(int argc, char* argv[]) + runWithSession(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Glacier2/chat/Server.cpp b/cpp/demo/Glacier2/chat/Server.cpp index 0cac02bac57..76127cd5d6b 100644 --- a/cpp/demo/Glacier2/chat/Server.cpp +++ b/cpp/demo/Glacier2/chat/Server.cpp @@ -42,7 +42,7 @@ class ChatServer : public Ice::Application public: virtual int - run(int argc, char* argv[]) + run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp index 48a8824fba5..c555ed6821b 100644 --- a/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp +++ b/cpp/demo/Ice/MFC/server/HelloServerDlg.cpp @@ -121,7 +121,7 @@ CHelloServerDlg::OnClear() } LRESULT -CHelloServerDlg::OnLog(WPARAM wParam, LPARAM lParam) +CHelloServerDlg::OnLog(WPARAM, LPARAM lParam) { char* text = (char*)lParam; diff --git a/cpp/demo/Ice/async/Server.cpp b/cpp/demo/Ice/async/Server.cpp index d069e379930..eec166a5349 100644 --- a/cpp/demo/Ice/async/Server.cpp +++ b/cpp/demo/Ice/async/Server.cpp @@ -33,7 +33,7 @@ main(int argc, char* argv[]) } int -AsyncServer::run(int argc, char* argv[]) +AsyncServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp index 20809447998..0cda6b4dc36 100644 --- a/cpp/demo/Ice/bidir/Client.cpp +++ b/cpp/demo/Ice/bidir/Client.cpp @@ -40,7 +40,7 @@ main(int argc, char* argv[]) } int -CallbackClient::run(int argc, char* argv[]) +CallbackClient::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/bidir/Server.cpp b/cpp/demo/Ice/bidir/Server.cpp index c23ea69dfc0..1a90e9f2f5b 100644 --- a/cpp/demo/Ice/bidir/Server.cpp +++ b/cpp/demo/Ice/bidir/Server.cpp @@ -28,7 +28,7 @@ main(int argc, char* argv[]) } int -CallbackServer::run(int argc, char* argv[]) +CallbackServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/callback/CallbackSenderI.cpp b/cpp/demo/Ice/callback/CallbackSenderI.cpp index 5a1a518f2c6..1132c9cd71c 100644 --- a/cpp/demo/Ice/callback/CallbackSenderI.cpp +++ b/cpp/demo/Ice/callback/CallbackSenderI.cpp @@ -15,7 +15,7 @@ using namespace Ice; using namespace Demo; void -CallbackSenderI::initiateCallback(const CallbackReceiverPrx& proxy, const Current& current) +CallbackSenderI::initiateCallback(const CallbackReceiverPrx& proxy, const Current&) { cout << "initiating callback" << endl; try diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp index 7f3ca67f288..a26d77d6971 100644 --- a/cpp/demo/Ice/callback/Client.cpp +++ b/cpp/demo/Ice/callback/Client.cpp @@ -63,7 +63,7 @@ CallbackClient::CallbackClient() : } int -CallbackClient::run(int argc, char* argv[]) +CallbackClient::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/callback/Server.cpp b/cpp/demo/Ice/callback/Server.cpp index bde8634a8b1..5b5bec8b810 100644 --- a/cpp/demo/Ice/callback/Server.cpp +++ b/cpp/demo/Ice/callback/Server.cpp @@ -28,7 +28,7 @@ main(int argc, char* argv[]) } int -CallbackServer::run(int argc, char* argv[]) +CallbackServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/converter/Server.cpp b/cpp/demo/Ice/converter/Server.cpp index e413c2da189..92e3d6a03e3 100644 --- a/cpp/demo/Ice/converter/Server.cpp +++ b/cpp/demo/Ice/converter/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -ConverterServer::run(int argc, char* argv[]) +ConverterServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp index 7ba40e412e8..3c3aef8bfab 100644 --- a/cpp/demo/Ice/hello/Server.cpp +++ b/cpp/demo/Ice/hello/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -HelloServer::run(int argc, char* argv[]) +HelloServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/interleaved/Server.cpp b/cpp/demo/Ice/interleaved/Server.cpp index ff698bd9b13..e3f93a3c905 100644 --- a/cpp/demo/Ice/interleaved/Server.cpp +++ b/cpp/demo/Ice/interleaved/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -ThroughputServer::run(int argc, char* argv[]) +ThroughputServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp index 722bdd199aa..c216cb29cea 100644 --- a/cpp/demo/Ice/invoke/Client.cpp +++ b/cpp/demo/Ice/invoke/Client.cpp @@ -61,7 +61,7 @@ InvokeClient::InvokeClient() : } int -InvokeClient::run(int argc, char* argv[]) +InvokeClient::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/invoke/Server.cpp b/cpp/demo/Ice/invoke/Server.cpp index 7123f1e63c0..169c26080e3 100644 --- a/cpp/demo/Ice/invoke/Server.cpp +++ b/cpp/demo/Ice/invoke/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -InvokeServer::run(int argc, char* argv[]) +InvokeServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp index ad02b7efe31..35dc375e487 100644 --- a/cpp/demo/Ice/latency/Server.cpp +++ b/cpp/demo/Ice/latency/Server.cpp @@ -28,7 +28,7 @@ main(int argc, char* argv[]) } int -LatencyServer::run(int argc, char* argv[]) +LatencyServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp index 8d987ab8eac..2c559cf3911 100644 --- a/cpp/demo/Ice/nested/Client.cpp +++ b/cpp/demo/Ice/nested/Client.cpp @@ -39,7 +39,7 @@ NestedClient::NestedClient() : } int -NestedClient::run(int argc, char* argv[]) +NestedClient::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/nested/NestedI.cpp b/cpp/demo/Ice/nested/NestedI.cpp index 104680b3cdb..71bd97372e9 100644 --- a/cpp/demo/Ice/nested/NestedI.cpp +++ b/cpp/demo/Ice/nested/NestedI.cpp @@ -20,7 +20,7 @@ NestedI::NestedI(const NestedPrx& self) : } void -NestedI::nestedCall(Int level, const NestedPrx& proxy, const Ice::Current& current) +NestedI::nestedCall(Int level, const NestedPrx& proxy, const Ice::Current&) { cout << level << endl; if(--level > 0) diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp index 090491dd019..cb40e7d8d4c 100644 --- a/cpp/demo/Ice/nested/Server.cpp +++ b/cpp/demo/Ice/nested/Server.cpp @@ -28,7 +28,7 @@ main(int argc, char* argv[]) } int -NestedServer::run(int argc, char* argv[]) +NestedServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/nrvo/Server.cpp b/cpp/demo/Ice/nrvo/Server.cpp index e62b50388ef..464d65ded9d 100644 --- a/cpp/demo/Ice/nrvo/Server.cpp +++ b/cpp/demo/Ice/nrvo/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -NrvotServer::run(int argc, char* argv[]) +NrvotServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/optional/Server.cpp b/cpp/demo/Ice/optional/Server.cpp index c841342ef80..71f7475fb5e 100644 --- a/cpp/demo/Ice/optional/Server.cpp +++ b/cpp/demo/Ice/optional/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -ContactServer::run(int argc, char* argv[]) +ContactServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/plugin/HelloPluginI.cpp b/cpp/demo/Ice/plugin/HelloPluginI.cpp index d65b83a2d32..9cf663c3efb 100644 --- a/cpp/demo/Ice/plugin/HelloPluginI.cpp +++ b/cpp/demo/Ice/plugin/HelloPluginI.cpp @@ -67,7 +67,7 @@ extern "C" { ICE_DECLSPEC_EXPORT ::Ice::Plugin* -createHello(const Ice::CommunicatorPtr& communicator, const string& name, const Ice::StringSeq& args) +createHello(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&) { return new HelloPluginI(communicator); } diff --git a/cpp/demo/Ice/plugin/LoggerPluginI.cpp b/cpp/demo/Ice/plugin/LoggerPluginI.cpp index 4ee5a7ea3ec..2069a40a513 100644 --- a/cpp/demo/Ice/plugin/LoggerPluginI.cpp +++ b/cpp/demo/Ice/plugin/LoggerPluginI.cpp @@ -55,7 +55,7 @@ extern "C" { ICE_DECLSPEC_EXPORT ::Ice::Plugin* -createLogger(const Ice::CommunicatorPtr& communicator, const string& name, const Ice::StringSeq& args) +createLogger(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&) { return new Ice::LoggerPlugin(communicator, new LoggerI); } diff --git a/cpp/demo/Ice/plugin/Server.cpp b/cpp/demo/Ice/plugin/Server.cpp index d2b6e37a3cc..17fa7ac3ba1 100644 --- a/cpp/demo/Ice/plugin/Server.cpp +++ b/cpp/demo/Ice/plugin/Server.cpp @@ -16,7 +16,7 @@ class PluginServer : public Ice::Application public: virtual int - run(int argc, char* argv[]) + run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/properties/Server.cpp b/cpp/demo/Ice/properties/Server.cpp index 5c6fdbc68f6..6cbe9c19dad 100644 --- a/cpp/demo/Ice/properties/Server.cpp +++ b/cpp/demo/Ice/properties/Server.cpp @@ -81,7 +81,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/session/Server.cpp b/cpp/demo/Ice/session/Server.cpp index 36c1987570f..36f393e7045 100644 --- a/cpp/demo/Ice/session/Server.cpp +++ b/cpp/demo/Ice/session/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -SessionServer::run(int argc, char* argv[]) +SessionServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/session/SessionI.cpp b/cpp/demo/Ice/session/SessionI.cpp index 32788c69cde..06340523888 100644 --- a/cpp/demo/Ice/session/SessionI.cpp +++ b/cpp/demo/Ice/session/SessionI.cpp @@ -64,7 +64,7 @@ SessionI::createHello(const Ice::Current& c) } void -SessionI::refresh(const Ice::Current& c) +SessionI::refresh(const Ice::Current&) { Lock sync(*this); if(_destroy) diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp index ff698bd9b13..e3f93a3c905 100644 --- a/cpp/demo/Ice/throughput/Server.cpp +++ b/cpp/demo/Ice/throughput/Server.cpp @@ -27,7 +27,7 @@ main(int argc, char* argv[]) } int -ThroughputServer::run(int argc, char* argv[]) +ThroughputServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp index 57e591829c8..8b10c08d3ec 100644 --- a/cpp/demo/Ice/value/Server.cpp +++ b/cpp/demo/Ice/value/Server.cpp @@ -28,7 +28,7 @@ main(int argc, char* argv[]) } int -ValueServer::run(int argc, char* argv[]) +ValueServer::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IceBox/hello/HelloServiceI.cpp b/cpp/demo/IceBox/hello/HelloServiceI.cpp index e409dd29a39..e74abfd0e26 100644 --- a/cpp/demo/IceBox/hello/HelloServiceI.cpp +++ b/cpp/demo/IceBox/hello/HelloServiceI.cpp @@ -36,7 +36,7 @@ HelloServiceI::~HelloServiceI() } void -HelloServiceI::start(const string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args) +HelloServiceI::start(const string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& /*args*/) { _adapter = communicator->createObjectAdapter(name); Demo::HelloPtr hello = new HelloI; diff --git a/cpp/demo/IceGrid/allocate/Server.cpp b/cpp/demo/IceGrid/allocate/Server.cpp index 7b5aa45be34..9f9beabc384 100644 --- a/cpp/demo/IceGrid/allocate/Server.cpp +++ b/cpp/demo/IceGrid/allocate/Server.cpp @@ -29,7 +29,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IceGrid/icebox/HelloServiceI.cpp b/cpp/demo/IceGrid/icebox/HelloServiceI.cpp index a39a86fd5f3..990a70fc9b6 100644 --- a/cpp/demo/IceGrid/icebox/HelloServiceI.cpp +++ b/cpp/demo/IceGrid/icebox/HelloServiceI.cpp @@ -28,7 +28,7 @@ create(Ice::CommunicatorPtr communicator) } void -HelloServiceI::start(const string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& args) +HelloServiceI::start(const string& name, const Ice::CommunicatorPtr& communicator, const Ice::StringSeq& /*args*/) { _adapter = communicator->createObjectAdapter("Hello-" + name); diff --git a/cpp/demo/IceGrid/replication/Server.cpp b/cpp/demo/IceGrid/replication/Server.cpp index 7b5aa45be34..9f9beabc384 100644 --- a/cpp/demo/IceGrid/replication/Server.cpp +++ b/cpp/demo/IceGrid/replication/Server.cpp @@ -29,7 +29,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IceGrid/secure/Server.cpp b/cpp/demo/IceGrid/secure/Server.cpp index c23ec76623d..2cf97432abb 100644 --- a/cpp/demo/IceGrid/secure/Server.cpp +++ b/cpp/demo/IceGrid/secure/Server.cpp @@ -36,7 +36,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IceGrid/sessionActivation/Server.cpp b/cpp/demo/IceGrid/sessionActivation/Server.cpp index 7b5aa45be34..9f9beabc384 100644 --- a/cpp/demo/IceGrid/sessionActivation/Server.cpp +++ b/cpp/demo/IceGrid/sessionActivation/Server.cpp @@ -29,7 +29,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IceGrid/simple/Server.cpp b/cpp/demo/IceGrid/simple/Server.cpp index c23ec76623d..2cf97432abb 100644 --- a/cpp/demo/IceGrid/simple/Server.cpp +++ b/cpp/demo/IceGrid/simple/Server.cpp @@ -36,7 +36,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp index 0f088cadf3a..20766445b39 100644 --- a/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp +++ b/cpp/demo/IcePatch2/MFC/PatchClientDlg.cpp @@ -50,7 +50,7 @@ public: } virtual bool - noFileSummary(const string& reason) + noFileSummary(const string& /*reason*/) { return IDYES == AfxMessageBox(L"Cannot load file summary. Perform a thorough patch?", MB_YESNO|MB_ICONSTOP); } diff --git a/cpp/demo/IceStorm/counter/Client.cpp b/cpp/demo/IceStorm/counter/Client.cpp index aa26c5fc6e7..0babc64e198 100644 --- a/cpp/demo/IceStorm/counter/Client.cpp +++ b/cpp/demo/IceStorm/counter/Client.cpp @@ -32,7 +32,7 @@ main(int argc, char* argv[]) } int -Client::run(int argc, char* argv[]) +Client::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/IceStorm/counter/Server.cpp b/cpp/demo/IceStorm/counter/Server.cpp index 3eeeaa8506a..80731fcac83 100644 --- a/cpp/demo/IceStorm/counter/Server.cpp +++ b/cpp/demo/IceStorm/counter/Server.cpp @@ -32,7 +32,7 @@ main(int argc, char* argv[]) } int -Server::run(int argc, char* argv[]) +Server::run(int argc, char*[]) { if(argc > 1) { diff --git a/cpp/demo/book/simple_filesystem/FilesystemI.cpp b/cpp/demo/book/simple_filesystem/FilesystemI.cpp index e1e552bc6c5..bff32dd0be7 100644 --- a/cpp/demo/book/simple_filesystem/FilesystemI.cpp +++ b/cpp/demo/book/simple_filesystem/FilesystemI.cpp @@ -22,7 +22,7 @@ Filesystem::NodeI::name(const Ice::Current&) // NodeI constructor -Filesystem::NodeI::NodeI(const Ice::CommunicatorPtr& communicator, const string& name, const DirectoryIPtr& parent) : +Filesystem::NodeI::NodeI(const Ice::CommunicatorPtr&, const string& name, const DirectoryIPtr& parent) : _name(name), _parent(parent) { // Create an identity. The root directory has the fixed identity "RootDir" @@ -74,7 +74,7 @@ Filesystem::FileI::FileI(const Ice::CommunicatorPtr& communicator, const string& // Slice Directory::list() operation Filesystem::NodeSeq -Filesystem::DirectoryI::list(const Ice::Current& c) +Filesystem::DirectoryI::list(const Ice::Current&) { return _contents; } diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h index 0e0714e581d..14209cce66c 100644 --- a/cpp/include/Ice/MetricsObserverI.h +++ b/cpp/include/Ice/MetricsObserverI.h @@ -347,7 +347,7 @@ public: } void - init(const MetricsHelperT<MetricsType>& helper, EntrySeqType& objects, ObserverT* previous = 0) + init(const MetricsHelperT<MetricsType>& /*helper*/, EntrySeqType& objects, ObserverT* previous = 0) { _objects.swap(objects); diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index c2d5d93aa31..020fcd33edb 100644 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -232,7 +232,7 @@ protected: } #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) std::pair<typename StoreMap::iterator, bool> ir = - _storeMap.insert(typename StoreMap::value_type(facet, nullptr)); + _storeMap.insert(typename StoreMap::value_type(facet, static_cast<ObjectStore<T>*>(nullptr))); #else std::pair<typename StoreMap::iterator, bool> ir = _storeMap.insert(typename StoreMap::value_type(facet, 0)); diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp index 11a9bfc4be4..6eb61dd6d49 100644 --- a/cpp/src/Freeze/IndexI.cpp +++ b/cpp/src/Freeze/IndexI.cpp @@ -396,7 +396,7 @@ Freeze::IndexI::associate(ObjectStoreBase* store, DbTxn* txn, } int -Freeze::IndexI::secondaryKeyCreate(Db* secondary, const Dbt* dbKey, +Freeze::IndexI::secondaryKeyCreate(Db* /*secondary*/, const Dbt* /*dbKey*/, const Dbt* dbValue, Dbt* result) { const Ice::CommunicatorPtr& communicator = _store->communicator(); diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp index ae21ce3302f..13e1db66950 100644 --- a/cpp/src/Freeze/MapI.cpp +++ b/cpp/src/Freeze/MapI.cpp @@ -1930,7 +1930,7 @@ Freeze::MapIndexI::untypedCount(const Key& k, const ConnectionIPtr& connection) } int -Freeze::MapIndexI::secondaryKeyCreate(Db* secondary, const Dbt* dbKey, +Freeze::MapIndexI::secondaryKeyCreate(Db* /*secondary*/, const Dbt* /*dbKey*/, const Dbt* dbValue, Dbt* result) { Byte* first = static_cast<Byte*>(dbValue->get_data()); diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp index c85bc6e29a3..1a5f7dd6d12 100644 --- a/cpp/src/Freeze/SharedDbEnv.cpp +++ b/cpp/src/Freeze/SharedDbEnv.cpp @@ -77,8 +77,8 @@ operator<(const MapKey& lhs, const MapKey& rhs) void dbErrCallback(const char* prefix, char* msg) #else - void - dbErrCallback(const ::DbEnv* ignored, const char* prefix, const char* msg) +void +dbErrCallback(const ::DbEnv* /*ignored*/, const char* prefix, const char* msg) #endif { const Freeze::SharedDbEnv* env = reinterpret_cast<const Freeze::SharedDbEnv*>(prefix); diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp index 00389dae18c..6e7f88dcdb0 100644 --- a/cpp/src/FreezeScript/Data.cpp +++ b/cpp/src/FreezeScript/Data.cpp @@ -1189,7 +1189,7 @@ FreezeScript::ProxyData::ProxyData(const Slice::TypePtr& type, const Ice::Commun } FreezeScript::DataPtr -FreezeScript::ProxyData::getMember(const string& member) const +FreezeScript::ProxyData::getMember(const string& /*member*/) const { // TODO: Support members (id, facet, etc.)? @@ -2142,7 +2142,7 @@ FreezeScript::ObjectData::getMember(const string& member) const } FreezeScript::DataPtr -FreezeScript::ObjectData::getElement(const DataPtr& element) const +FreezeScript::ObjectData::getElement(const DataPtr& /*element*/) const { _errorReporter->error("element requested of object value"); return 0; @@ -2155,14 +2155,14 @@ FreezeScript::ObjectData::operator==(const Data& rhs) const } bool -FreezeScript::ObjectData::operator!=(const Data& rhs) const +FreezeScript::ObjectData::operator!=(const Data& /*rhs*/) const { _errorReporter->error("object comparison not supported"); return false; } bool -FreezeScript::ObjectData::operator<(const Data& rhs) const +FreezeScript::ObjectData::operator<(const Data& /*rhs*/) const { _errorReporter->error("object comparison not supported"); return false; @@ -2198,7 +2198,7 @@ FreezeScript::ObjectData::marshal(const Ice::OutputStreamPtr& out) const } void -FreezeScript::ObjectData::unmarshal(const Ice::InputStreamPtr& in) +FreezeScript::ObjectData::unmarshal(const Ice::InputStreamPtr& /*in*/) { // // Unmarshaling is done by ObjectReader. @@ -2242,7 +2242,7 @@ FreezeScript::ObjectData::toString() const } void -FreezeScript::ObjectData::visit(DataVisitor& visitor) +FreezeScript::ObjectData::visit(DataVisitor& /*visitor*/) { assert(false); } @@ -2339,7 +2339,7 @@ FreezeScript::ObjectRef::operator!=(const Data& rhs) const } bool -FreezeScript::ObjectRef::operator<(const Data& rhs) const +FreezeScript::ObjectRef::operator<(const Data& /*rhs*/) const { _errorReporter->error("object comparison not supported"); return false; diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp index 27aef7b463d..e19a8650528 100644 --- a/cpp/src/FreezeScript/DumpDB.cpp +++ b/cpp/src/FreezeScript/DumpDB.cpp @@ -830,7 +830,7 @@ FreezeScript::DescriptorHandler::DescriptorHandler(const DataFactoryPtr& factory void FreezeScript::DescriptorHandler::startElement(const string& name, const IceXML::Attributes& attributes, int line, - int column) + int /*column*/) { DescriptorPtr d; @@ -956,7 +956,7 @@ FreezeScript::DescriptorHandler::startElement(const string& name, const IceXML:: } void -FreezeScript::DescriptorHandler::endElement(const std::string& name, int, int) +FreezeScript::DescriptorHandler::endElement(const std::string&, int, int) { assert(_current); _current = _current->parent(); @@ -968,7 +968,7 @@ FreezeScript::DescriptorHandler::characters(const std::string&, int, int) } void -FreezeScript::DescriptorHandler::error(const std::string& msg, int line, int col) +FreezeScript::DescriptorHandler::error(const std::string& msg, int line, int) { _errorReporter->descriptorError(msg, line); } diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp index ca06437d9ab..4b61939857f 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.cpp +++ b/cpp/src/FreezeScript/DumpDescriptors.cpp @@ -1249,7 +1249,7 @@ FreezeScript::RecordDescriptor::RecordDescriptor(const DescriptorPtr& parent, in } void -FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& sym, ExecuteInfo* info) +FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& /*sym*/, ExecuteInfo* info) { // // Temporarily add an object factory. @@ -1398,7 +1398,7 @@ FreezeScript::DatabaseDescriptor::execute(const SymbolTablePtr&, ExecuteInfo* in // FreezeScript::DumpDBDescriptor::DumpDBDescriptor(int line, const DataFactoryPtr& factory, const ErrorReporterPtr& errorReporter, - const IceXML::Attributes& attributes, const Slice::UnitPtr& unit) : + const IceXML::Attributes& /*attributes*/, const Slice::UnitPtr& unit) : Descriptor(0, line, factory, errorReporter), _unit(unit), _info(new ExecuteInfo) { _info->symbolTable = new SymbolTableI(factory, unit, errorReporter, _info); diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp index 0fcf26f067a..ab374d3a19e 100644 --- a/cpp/src/FreezeScript/Parser.cpp +++ b/cpp/src/FreezeScript/Parser.cpp @@ -129,7 +129,7 @@ FreezeScript::parseExpression(const string& expr, const DataFactoryPtr& factory, // getInput supplies characters to the lexical scanner. // int -FreezeScript::getInput(char* buf, int maxSize) +FreezeScript::getInput(char* buf, int /*maxSize*/) { if(_pos < _input.length()) { @@ -544,7 +544,7 @@ FreezeScript::DataNode::evaluate(const SymbolTablePtr&) } void -FreezeScript::DataNode::print(ostream& os) const +FreezeScript::DataNode::print(ostream& /*os*/) const { // TODO //_data->print(os); diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp index 4a5d4c6ff98..d54559de04c 100644 --- a/cpp/src/FreezeScript/TransformVisitor.cpp +++ b/cpp/src/FreezeScript/TransformVisitor.cpp @@ -529,7 +529,7 @@ FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const objectDataMap.erase(p); #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr)); + objectDataMap.insert(ObjectDataMap::value_type(src.get(), static_cast<ObjectDataPtr>(nullptr))); #else objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0)); #endif diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp index 3fda2cf467e..5048e82cffc 100644 --- a/cpp/src/FreezeScript/Transformer.cpp +++ b/cpp/src/FreezeScript/Transformer.cpp @@ -1883,7 +1883,7 @@ FreezeScript::RecordDescriptor::RecordDescriptor(const DescriptorPtr& parent, in } void -FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& sym) +FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& /*sym*/) { // // Temporarily add an object factory. @@ -2650,7 +2650,7 @@ FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data) if(p == _map.end()) { #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - _map.insert(ObjectDataMap::value_type(value.get(), nullptr)); + _map.insert(ObjectDataMap::value_type(value.get(), static_cast<ObjectDataPtr>(nullptr))); #else _map.insert(ObjectDataMap::value_type(value.get(), 0)); #endif @@ -2814,7 +2814,7 @@ FreezeScript::DescriptorHandler::DescriptorHandler(const TransformInfoIPtr& info void FreezeScript::DescriptorHandler::startElement(const string& name, const IceXML::Attributes& attributes, int line, - int column) + int /*column*/) { DescriptorPtr d; @@ -2958,7 +2958,7 @@ FreezeScript::DescriptorHandler::startElement(const string& name, const IceXML:: } void -FreezeScript::DescriptorHandler::endElement(const string& name, int, int) +FreezeScript::DescriptorHandler::endElement(const string&, int, int) { assert(_current); _current = _current->parent(); @@ -2970,7 +2970,7 @@ FreezeScript::DescriptorHandler::characters(const string&, int, int) } void -FreezeScript::DescriptorHandler::error(const string& msg, int line, int col) +FreezeScript::DescriptorHandler::error(const string& msg, int line, int) { _info->errorReporter->descriptorError(msg, line); } diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp index 3c7098e3968..c405132fe8b 100644 --- a/cpp/src/Glacier2/Blobject.cpp +++ b/cpp/src/Glacier2/Blobject.cpp @@ -91,7 +91,8 @@ Glacier2::Blobject::invokeSent(bool sent, const AMD_Object_ice_invokePtr& amdCB) if(sent) { #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr)); + amdCB->ice_response(true, pair<const Byte*, const Byte*>(static_cast<const Byte*>(nullptr), + static_cast<const Byte*>(nullptr))); #else amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0)); #endif diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index 131cfc43ade..9e0a18dd980 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -69,7 +69,7 @@ class NullPermissionsVerifierI : public Glacier2::PermissionsVerifier { public: - bool checkPermissions(const string& userId, const string& password, string&, const Current&) const + bool checkPermissions(const string&, const string&, string&, const Current&) const { return true; } diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp index 23ab5baaed2..e38b2883644 100644 --- a/cpp/src/Glacier2/RequestQueue.cpp +++ b/cpp/src/Glacier2/RequestQueue.cpp @@ -169,7 +169,8 @@ Glacier2::Request::queued() if(!_proxy->ice_isTwoway()) { #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - _amdCB->ice_response(true, pair<const Byte*, const Byte*>(nullptr, nullptr)); + _amdCB->ice_response(true, pair<const Byte*, const Byte*>(static_cast<const Byte*>(nullptr), + static_cast<const Byte*>(nullptr))); #else _amdCB->ice_response(true, pair<const Byte*, const Byte*>(0, 0)); #endif diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index 806071206be..46630b88cee 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -38,7 +38,7 @@ public: } void - exception(const Ice::Exception& ex) + exception(const Ice::Exception&) { // // Here the session has been destroyed. The thread terminates, diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index d64d99f59a1..46f6e440241 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -2158,8 +2158,12 @@ IceInternal::BasicStream::EncapsDecoder10::throwException(const UserExceptionFac } } -void +void +#ifndef NDEBUG IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType sliceType) +#else +IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType) +#endif { assert(_sliceType == sliceType); _skipFirstSlice = true; @@ -2451,8 +2455,12 @@ IceInternal::BasicStream::EncapsDecoder11::throwException(const UserExceptionFac } } -void +void +#ifndef NDEBUG IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType sliceType) +#else +IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType) +#endif { assert(_current->sliceType == sliceType); _current->skipFirstSlice = true; @@ -2937,7 +2945,7 @@ IceInternal::BasicStream::EncapsEncoder10::endInstance() } void -IceInternal::BasicStream::EncapsEncoder10::startSlice(const string& typeId, int, bool last) +IceInternal::BasicStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/) { // // For object slices, encode a boolean to indicate how the type ID diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 78963794398..38bd441a2d9 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -977,7 +977,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartComplete } void -IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(const ConnectionIPtr& connection, +IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(const ConnectionIPtr& /*connection*/, const LocalException& ex) { assert(_iter != _connectors.end()); @@ -1544,7 +1544,7 @@ IceInternal::IncomingConnectionFactory::connectionStartCompleted(const Ice::Conn } void -IceInternal::IncomingConnectionFactory::connectionStartFailed(const Ice::ConnectionIPtr& connection, +IceInternal::IncomingConnectionFactory::connectionStartFailed(const Ice::ConnectionIPtr& /*connection*/, const Ice::LocalException& ex) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index d618dfefcf9..8804cc0e804 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -88,7 +88,7 @@ ConnectionRequestHandler::flushAsyncBatchRequests(const BatchOutgoingAsyncPtr& o } Ice::ConnectionIPtr -ConnectionRequestHandler::getConnection(bool wait) +ConnectionRequestHandler::getConnection(bool /*wait*/) { return _connection; } diff --git a/cpp/src/Ice/DispatchInterceptor.cpp b/cpp/src/Ice/DispatchInterceptor.cpp index be2109e57d8..7469c241d5e 100644 --- a/cpp/src/Ice/DispatchInterceptor.cpp +++ b/cpp/src/Ice/DispatchInterceptor.cpp @@ -16,7 +16,7 @@ using namespace Ice; using namespace IceInternal; DispatchStatus -Ice::DispatchInterceptor::__dispatch(IceInternal::Incoming& in, const Current& current) +Ice::DispatchInterceptor::__dispatch(IceInternal::Incoming& in, const Current& /*current*/) { try { diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp index 05f75b778d6..3d25afcc7fc 100644 --- a/cpp/src/Ice/EndpointI.cpp +++ b/cpp/src/Ice/EndpointI.cpp @@ -64,7 +64,7 @@ IceInternal::EndpointI::internal_getHash() const } vector<ConnectorPtr> -IceInternal::EndpointI::connectors(const vector<Address>& addrs) const +IceInternal::EndpointI::connectors(const vector<Address>& /*addrs*/) const { // // This method must be extended by endpoints which use the EndpointHostResolver to create diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 8531adb9005..30a3a4a1672 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -68,7 +68,7 @@ Ice::argsToStringSeq(int argc, wchar_t* argv[]) } StringSeq -Ice::argsToStringSeq(int argc, wchar_t* argv[], const StringConverterPtr& converter) +Ice::argsToStringSeq(int /*argc*/, wchar_t* argv[], const StringConverterPtr& converter) { StringSeq args; for(int i=0; argv[i] != 0; i++) diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 5c4767d533f..31a9b4a7f09 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -95,10 +95,12 @@ setKeepAlive(SOCKET fd) } #endif +#ifdef ICE_OS_WINRT SOCKET -createSocketImpl(bool udp, int family) +createSocketImpl(bool udp, int) { -#ifdef ICE_OS_WINRT + SOCKET fd; + if(udp) { return ref new DatagramSocket(); @@ -110,7 +112,13 @@ createSocketImpl(bool udp, int family) socket->Control->NoDelay = true; return socket; } + + return fd; +} #else +SOCKET +createSocketImpl(bool udp, int family) +{ SOCKET fd; if(udp) @@ -136,14 +144,14 @@ createSocketImpl(bool udp, int family) } return fd; -#endif } +#endif +#ifdef ICE_OS_WINRT Address -getAddressImpl(const string& host, int port, ProtocolSupport protocol, bool server) +getAddressImpl(const string& host, int port, ProtocolSupport, bool server) { Address addr; -#ifdef ICE_OS_WINRT ostringstream os; os << port; addr.port = ref new String(IceUtil::stringToWstring(os.str()).c_str()); @@ -162,7 +170,13 @@ getAddressImpl(const string& host, int port, ProtocolSupport protocol, bool serv { addr.host = ref new HostName(ref new String(IceUtil::stringToWstring(host).c_str())); } + return addr; +} #else +Address +getAddressImpl(const string& host, int port, ProtocolSupport protocol, bool server) +{ + Address addr; memset(&addr.saStorage, 0, sizeof(sockaddr_storage)); // @@ -245,9 +259,9 @@ getAddressImpl(const string& host, int port, ProtocolSupport protocol, bool serv throw ex; } freeaddrinfo(info); -#endif return addr; } +#endif #ifndef ICE_OS_WINRT vector<Address> @@ -613,30 +627,44 @@ IceInternal::noMoreFds(int error) #endif } +#if defined(ICE_OS_WINRT) string -IceInternal::errorToStringDNS(int error) +IceInternal::errorToStringDNS(int) { -#if defined(ICE_OS_WINRT) return "Host not found"; -#elif defined(_WIN32) - return IceUtilInternal::errorToString(error); +} #else +string +IceInternal::errorToStringDNS(int error) +{ +# if defined(_WIN32) + return IceUtilInternal::errorToString(error); +# else return gai_strerror(error); -#endif +# endif } +#endif +#ifdef ICE_OS_WINRT vector<Address> -IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol, bool blocking) +IceInternal::getAddresses(const string& host, int port, ProtocolSupport, bool) { vector<Address> result; Address addr; -#ifdef ICE_OS_WINRT addr.host = ref new HostName(host.empty() ? "localhost" : ref new String(IceUtil::stringToWstring(host).c_str())); stringstream os; os << port; addr.port = ref new String(IceUtil::stringToWstring(os.str()).c_str()); result.push_back(addr); + return result; +} #else +vector<Address> +IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol, bool blocking) +{ + vector<Address> result; + Address addr; + memset(&addr.saStorage, 0, sizeof(sockaddr_storage)); // @@ -695,11 +723,11 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol // AI_NUMERICHOST is specified and the host name is not a IP // address. However on some platforms (e.g. OS X 10.4.x) // EAI_NODATA is also returned so we also check for it. -#ifdef EAI_NODATA +# ifdef EAI_NODATA if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA)) -#else +# else if(!blocking && rs == EAI_NONAME) -#endif +# endif { return result; // Empty result indicates that a blocking lookup is necessary. } @@ -746,20 +774,24 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol ex.host = host; throw ex; } -#endif return result; } +#endif +#ifdef ICE_OS_WINRT ProtocolSupport -IceInternal::getProtocolSupport(const Address& addr) +IceInternal::getProtocolSupport(const Address&) { -#ifndef ICE_OS_WINRT - return addr.saStorage.ss_family == AF_INET ? EnableIPv4 : EnableIPv6; -#else // For WinRT, there's no distinction between IPv4 and IPv6 adresses. return EnableBoth; -#endif } +#else +ProtocolSupport +IceInternal::getProtocolSupport(const Address& addr) +{ + return addr.saStorage.ss_family == AF_INET ? EnableIPv4 : EnableIPv6; +} +#endif Address IceInternal::getAddressForServer(const string& host, int port, ProtocolSupport protocol) @@ -839,16 +871,19 @@ IceInternal::compareAddress(const Address& addr1, const Address& addr2) #endif } +#ifdef ICE_OS_WINRT SOCKET -IceInternal::createSocket(bool udp, const Address& addr) +IceInternal::createSocket(bool udp, const Address&) { -#ifdef ICE_OS_WINRT return createSocketImpl(udp, 0); +} #else +SOCKET +IceInternal::createSocket(bool udp, const Address& addr) +{ return createSocketImpl(udp, addr.saStorage.ss_family); -#endif } - +#endif void IceInternal::closeSocketNoThrow(SOCKET fd) @@ -1059,12 +1094,21 @@ IceInternal::isAddressValid(const Address& addr) #endif } +#ifdef ICE_OS_WINRT +vector<string> +IceInternal::getHostsForEndpointExpand(const string&, ProtocolSupport, bool) +{ + // + // No support for expanding wildcard addresses on WinRT + // + vector<string> hosts; + return hosts; +} +#else vector<string> IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport protocolSupport, bool includeLoopback) { vector<string> hosts; - -#ifndef ICE_OS_WINRT if(host.empty() || isWildcard(host, protocolSupport)) { vector<Address> addrs = getLocalAddresses(protocolSupport); @@ -1092,13 +1136,9 @@ IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport proto } } } -#else - // - // No support for expanding wildcard addresses on WinRT - // -#endif return hosts; // An empty host list indicates to just use the given host. } +#endif string IceInternal::inetAddrToString(const Address& ss) @@ -1272,7 +1312,11 @@ IceInternal::setTcpBufSize(SOCKET fd, const Ice::PropertiesPtr& properties, cons } void +#ifndef ICE_OS_WINRT IceInternal::setBlock(SOCKET fd, bool block) +#else +IceInternal::setBlock(SOCKET fd, bool) +#endif { #ifndef ICE_OS_WINRT if(block) @@ -1369,10 +1413,16 @@ IceInternal::getSendBufferSize(SOCKET fd) #endif } +#ifdef ICE_OS_WINRT +void +IceInternal::setRecvBufferSize(SOCKET, int) +{ +} +#else void IceInternal::setRecvBufferSize(SOCKET fd, int sz) { -#ifndef ICE_OS_WINRT + if(setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&sz, int(sizeof(int))) == SOCKET_ERROR) { closeSocketNoThrow(fd); @@ -1380,8 +1430,8 @@ IceInternal::setRecvBufferSize(SOCKET fd, int sz) ex.error = getSocketErrno(); throw ex; } -#endif } +#endif int IceInternal::getRecvBufferSize(SOCKET fd) @@ -1403,10 +1453,10 @@ IceInternal::getRecvBufferSize(SOCKET fd) #endif } +#ifndef ICE_OS_WINRT void IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf) { -#ifndef ICE_OS_WINRT int rc; if(group.saStorage.ss_family == AF_INET) { @@ -1459,7 +1509,11 @@ IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf) ex.error = getSocketErrno(); throw ex; } +} #else +void +IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string&) +{ try { // @@ -1471,13 +1525,18 @@ IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf) { throw SocketException(__FILE__, __LINE__, (int)SocketError::GetStatus(pex->HResult)); } -#endif } +#endif +#ifdef ICE_OS_WINRT +void +IceInternal::setMcastInterface(SOCKET, const string&, const Address&) +{ +} +#else void IceInternal::setMcastInterface(SOCKET fd, const string& intf, const Address& addr) { -#ifndef ICE_OS_WINRT int rc; if(addr.saStorage.ss_family == AF_INET) { @@ -1517,13 +1576,18 @@ IceInternal::setMcastInterface(SOCKET fd, const string& intf, const Address& add ex.error = getSocketErrno(); throw ex; } -#endif } +#endif +#ifdef ICE_OS_WINRT +void +IceInternal::setMcastTtl(SOCKET, int, const Address&) +{ +} +#else void IceInternal::setMcastTtl(SOCKET fd, int ttl, const Address& addr) { -#ifndef ICE_OS_WINRT int rc; if(addr.saStorage.ss_family == AF_INET) { @@ -1540,13 +1604,18 @@ IceInternal::setMcastTtl(SOCKET fd, int ttl, const Address& addr) ex.error = getSocketErrno(); throw ex; } -#endif } +#endif +#ifdef ICE_OS_WINRT +void +IceInternal::setReuseAddress(SOCKET, bool) +{ +} +#else void IceInternal::setReuseAddress(SOCKET fd, bool reuse) { -#ifndef ICE_OS_WINRT int flag = reuse ? 1 : 0; if(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR) { @@ -1555,8 +1624,8 @@ IceInternal::setReuseAddress(SOCKET fd, bool reuse) ex.error = getSocketErrno(); throw ex; } -#endif } +#endif Address IceInternal::doBind(SOCKET fd, const Address& addr) diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 6f68cb9b6f2..5ffa11d3b41 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -899,7 +899,7 @@ IceInternal::BatchOutgoingAsync::BatchOutgoingAsync(const CommunicatorPtr& commu } bool -IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* connection) +IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* /*connection*/) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor); assert(!_exception.get()); diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 5d930c0310b..a7528a77511 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1759,7 +1759,7 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref, const ::Ice::ObjectPrx } bool -IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context, InvocationObserver& observer) +IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context, InvocationObserver& /*observer*/) { class DirectI : public Direct { @@ -2012,7 +2012,7 @@ IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context, InvocationObser bool IceDelegateD::Ice::Object::ice_invoke(const string&, OperationMode, - const pair<const Byte*, const Byte*>& inEncaps, + const pair<const Byte*, const Byte*>& /*inEncaps*/, vector<Byte>&, const Context*, InvocationObserver&) @@ -2022,7 +2022,7 @@ IceDelegateD::Ice::Object::ice_invoke(const string&, } void -IceDelegateD::Ice::Object::ice_flushBatchRequests(InvocationObserver& observer) +IceDelegateD::Ice::Object::ice_flushBatchRequests(InvocationObserver& /*observer*/) { throw CollocationOptimizationException(__FILE__, __LINE__); } diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index a3d9f9478ca..4983ac40157 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -599,14 +599,14 @@ IceInternal::FixedReference::getConnectionId() const } ReferencePtr -IceInternal::FixedReference::changeEndpoints(const vector<EndpointIPtr>& newEndpoints) const +IceInternal::FixedReference::changeEndpoints(const vector<EndpointIPtr>& /*newEndpoints*/) const { throw FixedProxyException(__FILE__, __LINE__); return 0; // Keep the compiler happy. } ReferencePtr -IceInternal::FixedReference::changeAdapterId(const string& newAdapterId) const +IceInternal::FixedReference::changeAdapterId(const string& /*newAdapterId*/) const { throw FixedProxyException(__FILE__, __LINE__); return 0; // Keep the compiler happy. @@ -688,7 +688,7 @@ IceInternal::FixedReference::isWellKnown() const } void -IceInternal::FixedReference::streamWrite(BasicStream* s) const +IceInternal::FixedReference::streamWrite(BasicStream*) const { throw FixedProxyException(__FILE__, __LINE__); } diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index 84feadb9869..5ffdc95ba88 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -353,7 +353,7 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy) vector<EndpointIPtr> -IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& serverProxy) +IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy*/) { IceUtil::Mutex::Lock sync(*this); if(_serverEndpoints.empty()) // Lazy initialization. diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index 51a26c3d4ae..8d8f4174318 100644 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -32,7 +32,11 @@ IceInternal::TcpAcceptor::getNativeInfo() #ifdef ICE_USE_IOCP AsyncInfo* +# ifndef NDEBUG IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation op) +# else +IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation) +# endif { assert(op == SocketOperationRead); return &_info; diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index c5efcf7aa62..b06335bc2f5 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -151,12 +151,17 @@ IceInternal::UdpTransceiver::close() _fd = INVALID_SOCKET; } + +#ifdef ICE_OS_WINRT bool -IceInternal::UdpTransceiver::write(Buffer& buf) +IceInternal::UdpTransceiver::write(Buffer&) { -#ifdef ICE_OS_WINRT return false; +} #else +bool +IceInternal::UdpTransceiver::write(Buffer& buf) +{ assert(buf.i == buf.b.begin()); assert(_fd != INVALID_SOCKET && _state >= StateConnected); @@ -233,15 +238,19 @@ repeat: assert(ret == static_cast<ssize_t>(buf.b.size())); buf.i = buf.b.end(); return true; -#endif } +#endif +#ifdef ICE_OS_WINRT bool -IceInternal::UdpTransceiver::read(Buffer& buf) +IceInternal::UdpTransceiver::read(Buffer&) { -#ifdef ICE_OS_WINRT return false; +} #else +bool +IceInternal::UdpTransceiver::read(Buffer& buf) +{ assert(buf.i == buf.b.begin()); assert(_fd != INVALID_SOCKET); @@ -345,8 +354,8 @@ repeat: buf.b.resize(ret); buf.i = buf.b.end(); return true; -#endif } +#endif #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) bool @@ -873,8 +882,14 @@ IceInternal::UdpTransceiver::effectivePort() const IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const Address& addr, +#ifdef ICE_OS_WINRT + const string&, + int +#else const string& mcastInterface, - int mcastTtl) : + int mcastTtl +#endif + ) : _traceLevels(instance->traceLevels()), _logger(instance->initializationData().logger), _stats(instance->initializationData().stats), diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp index b9d42409ad6..380e3ef84ec 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.cpp +++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp @@ -149,13 +149,13 @@ IceInternal::StreamTransceiver::close() } bool -IceInternal::StreamTransceiver::write(Buffer& buf) +IceInternal::StreamTransceiver::write(Buffer&) { return false; } bool -IceInternal::StreamTransceiver::read(Buffer& buf) +IceInternal::StreamTransceiver::read(Buffer&) { return false; } diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index e9e42e9024e..eac3ebdcbac 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -496,7 +496,7 @@ ReplicaGroupEntry::addSyncCallback(const SynchronizationCallbackPtr& callback, c } void -ReplicaGroupEntry::addReplica(const string& replicaId, const ServerAdapterEntryPtr& adapter) +ReplicaGroupEntry::addReplica(const string& /*replicaId*/, const ServerAdapterEntryPtr& adapter) { Lock sync(*this); _replicas.push_back(adapter); diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index b78f13483df..676466a36fe 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -690,7 +690,7 @@ AdminI::addObject(const Ice::ObjectPrx& proxy, const ::Ice::Current& current) } void -AdminI::updateObject(const Ice::ObjectPrx& proxy, const ::Ice::Current& current) +AdminI::updateObject(const Ice::ObjectPrx& proxy, const ::Ice::Current&) { checkIsReadOnly(); @@ -712,7 +712,7 @@ AdminI::updateObject(const Ice::ObjectPrx& proxy, const ::Ice::Current& current) } void -AdminI::addObjectWithType(const Ice::ObjectPrx& proxy, const string& type, const ::Ice::Current& current) +AdminI::addObjectWithType(const Ice::ObjectPrx& proxy, const string& type, const ::Ice::Current&) { checkIsReadOnly(); @@ -737,7 +737,7 @@ AdminI::addObjectWithType(const Ice::ObjectPrx& proxy, const string& type, const } void -AdminI::removeObject(const Ice::Identity& id, const Ice::Current& current) +AdminI::removeObject(const Ice::Identity& id, const Ice::Current&) { checkIsReadOnly(); if(id.category == _database->getInstanceName()) diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 25aeaffe85a..8cabcba8fee 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -34,7 +34,7 @@ FileIteratorI::FileIteratorI(const AdminSessionIPtr& session, } bool -FileIteratorI::read(int size, Ice::StringSeq& lines, const Ice::Current& current) +FileIteratorI::read(int size, Ice::StringSeq& lines, const Ice::Current&) { try { @@ -96,13 +96,13 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I } AdminPrx -AdminSessionI::getAdmin(const Ice::Current& current) const +AdminSessionI::getAdmin(const Ice::Current&) const { return _admin; } Ice::ObjectPrx -AdminSessionI::getAdminCallbackTemplate(const Ice::Current& current) const +AdminSessionI::getAdminCallbackTemplate(const Ice::Current&) const { return _adminCallbackTemplate; } @@ -223,7 +223,7 @@ AdminSessionI::finishUpdate(const Ice::Current& current) } string -AdminSessionI::getReplicaName(const Ice::Current& current) const +AdminSessionI::getReplicaName(const Ice::Current&) const { return _replicaName; } @@ -378,7 +378,7 @@ AdminSessionI::addFileIterator(const FileReaderPrx& reader, } void -AdminSessionI::removeFileIterator(const Ice::Identity& id, const Ice::Current& current) +AdminSessionI::removeFileIterator(const Ice::Identity& id, const Ice::Current&) { Lock sync(*this); _servantManager->remove(id); @@ -489,7 +489,7 @@ AdminSessionManagerI::AdminSessionManagerI(const AdminSessionFactoryPtr& factory } Glacier2::SessionPrx -AdminSessionManagerI::create(const string& userId, const Glacier2::SessionControlPrx& ctl, const Ice::Current& current) +AdminSessionManagerI::create(const string& userId, const Glacier2::SessionControlPrx& ctl, const Ice::Current&) { return _factory->createGlacier2Session(userId, ctl); } @@ -501,7 +501,7 @@ AdminSSLSessionManagerI::AdminSSLSessionManagerI(const AdminSessionFactoryPtr& f Glacier2::SessionPrx AdminSSLSessionManagerI::create(const Glacier2::SSLInfo& info, const Glacier2::SessionControlPrx& ctl, - const Ice::Current& current) + const Ice::Current&) { string userDN; if(!info.certs.empty()) // TODO: Require userDN? diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp index 37b6eda4ec4..c4bc8ebb400 100644 --- a/cpp/src/IceGrid/Allocatable.cpp +++ b/cpp/src/IceGrid/Allocatable.cpp @@ -52,7 +52,7 @@ AllocationRequest::pending() } bool -AllocationRequest::allocate(const AllocatablePtr& allocatable, const SessionIPtr& session) +AllocationRequest::allocate(const AllocatablePtr& /*allocatable*/, const SessionIPtr& session) { Lock sync(*this); switch(_state) diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h index ef304e712ea..fccbe7e1548 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.h +++ b/cpp/src/IceGrid/AllocatableObjectCache.h @@ -57,7 +57,7 @@ public: private: - virtual void allocated(const AllocatablePtr& allocatable, const SessionIPtr& session) + virtual void allocated(const AllocatablePtr& allocatable, const SessionIPtr& /*session*/) { response(AllocatableObjectEntryPtr::dynamicCast(allocatable)->getProxy()); } diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index b13eb8a2bd0..332b400542a 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -174,7 +174,7 @@ private: }; static void -interruptCallback(int signal) +interruptCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex); if(_globalClient) diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp index a3e0536c002..bd07c6b457b 100644 --- a/cpp/src/IceGrid/Database.cpp +++ b/cpp/src/IceGrid/Database.cpp @@ -2198,7 +2198,7 @@ Database::finishApplicationUpdate(const ApplicationUpdateInfo& update, const ApplicationInfo& oldApp, const ApplicationHelper& previous, const ApplicationHelper& helper, - AdminSessionI* session, + AdminSessionI* /*session*/, bool noRestart) { const ApplicationDescriptor& newDesc = helper.getDefinition(); diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index fbe7d514454..5976f53ba7b 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -851,14 +851,14 @@ ServerDescriptorBuilder::init(const ServerDescriptorPtr& desc, const XmlAttribut } ServiceDescriptorBuilder* -ServerDescriptorBuilder::createService(const XmlAttributesHelper& attrs) +ServerDescriptorBuilder::createService(const XmlAttributesHelper& /*attrs*/) { throw "<service> element can only be a child of an <icebox> element"; return 0; } ServiceInstanceDescriptorBuilder* -ServerDescriptorBuilder::createServiceInstance(const XmlAttributesHelper& attrs) +ServerDescriptorBuilder::createServiceInstance(const XmlAttributesHelper& /*attrs*/) { throw "<service-instance> element can only be a child of an <icebox> element"; return 0; @@ -877,13 +877,13 @@ ServerDescriptorBuilder::addEnv(const string& v) } void -ServerDescriptorBuilder::addService(const ServiceDescriptorPtr& desc) +ServerDescriptorBuilder::addService(const ServiceDescriptorPtr& /*desc*/) { assert(false); } void -ServerDescriptorBuilder::addServiceInstance(const ServiceInstanceDescriptor& desc) +ServerDescriptorBuilder::addServiceInstance(const ServiceInstanceDescriptor& /*desc*/) { assert(false); } @@ -927,13 +927,13 @@ IceBoxDescriptorBuilder::createServiceInstance(const XmlAttributesHelper& attrs) } void -IceBoxDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) +IceBoxDescriptorBuilder::addAdapter(const XmlAttributesHelper& /*attrs*/) { throw "<adapter> element can't be a child of an <icebox> element"; } void -IceBoxDescriptorBuilder::addDbEnv(const XmlAttributesHelper& attrs) +IceBoxDescriptorBuilder::addDbEnv(const XmlAttributesHelper& /*attrs*/) { throw "<dbenv> element can't be a child of an <icebox> element"; } diff --git a/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp b/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp index 72f3f3560fe..a4794f86ffa 100644 --- a/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp +++ b/cpp/src/IceGrid/FreezeDB/FreezeDB.cpp @@ -22,7 +22,7 @@ extern "C" { ICE_DECLSPEC_EXPORT ::Ice::Plugin* -createFreezeDB(const Ice::CommunicatorPtr& communicator, const string& name, const Ice::StringSeq& args) +createFreezeDB(const Ice::CommunicatorPtr& communicator, const string& /*name*/, const Ice::StringSeq& /*args*/) { return new IceGrid::FreezeDBPlugin(communicator); } diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 51ed870f3de..1bed6270f5e 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -105,7 +105,7 @@ public: { } - virtual ObjectPtr locate(const Current& c, LocalObjectPtr&) + virtual ObjectPtr locate(const Current&, LocalObjectPtr&) { return _servant; } diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp index 8d5f7b081ed..af2202edd05 100644 --- a/cpp/src/IceGrid/InternalRegistryI.cpp +++ b/cpp/src/IceGrid/InternalRegistryI.cpp @@ -215,7 +215,7 @@ InternalRegistryI::getReplicas(const Ice::Current&) const } void -InternalRegistryI::shutdown(const Ice::Current& current) const +InternalRegistryI::shutdown(const Ice::Current& /*current*/) const { _registry->shutdown(); } diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index b5c90d5ee87..2ebc6fbc22a 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -322,7 +322,7 @@ public: } virtual void - exception(const string& id, const Ice::Exception& ex) + exception(const string& /*id*/, const Ice::Exception& ex) { LocatorAdapterInfo adapter; { @@ -826,7 +826,7 @@ LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator, void LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::Identity& id, - const Ice::Current& current) const + const Ice::Current&) const { try { diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 37ff9089f09..a94993eeb0e 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -103,7 +103,7 @@ public: } virtual bool - fileListProgress(Ice::Int percent) + fileListProgress(Ice::Int /*percent*/) { return true; } @@ -120,7 +120,7 @@ public: } virtual bool - patchStart(const string& path, Ice::Long size, Ice::Long totalProgress, Ice::Long totalSize) + patchStart(const string& /*path*/, Ice::Long /*size*/, Ice::Long totalProgress, Ice::Long totalSize) { if(_traceLevels->patch > 1 && totalSize > (1024 * 1024)) { @@ -158,7 +158,7 @@ public: } virtual bool - patchProgress(Ice::Long progress, Ice::Long size, Ice::Long totalProgress, Ice::Long totalSize) + patchProgress(Ice::Long /*progress*/, Ice::Long /*size*/, Ice::Long /*totalProgress*/, Ice::Long /*totalSize*/) { return true; } diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp index 3d14272846a..3cdcf086862 100644 --- a/cpp/src/IceGrid/NodeSessionI.cpp +++ b/cpp/src/IceGrid/NodeSessionI.cpp @@ -181,7 +181,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database, } void -NodeSessionI::keepAlive(const LoadInfo& load, const Ice::Current& current) +NodeSessionI::keepAlive(const LoadInfo& load, const Ice::Current&) { Lock sync(*this); if(_destroy) @@ -219,19 +219,19 @@ NodeSessionI::setReplicaObserver(const ReplicaObserverPrx& observer, const Ice:: } int -NodeSessionI::getTimeout(const Ice::Current& current) const +NodeSessionI::getTimeout(const Ice::Current&) const { return _timeout; } NodeObserverPrx -NodeSessionI::getObserver(const Ice::Current& current) const +NodeSessionI::getObserver(const Ice::Current&) const { return NodeObserverTopicPtr::dynamicCast(_database->getObserverTopic(NodeObserverTopicName))->getPublisher(); } void -NodeSessionI::loadServers_async(const AMD_NodeSession_loadServersPtr& amdCB, const Ice::Current& current) const +NodeSessionI::loadServers_async(const AMD_NodeSession_loadServersPtr& amdCB, const Ice::Current&) const { // // No need to wait for the servers to be loaded. If we were @@ -253,7 +253,7 @@ NodeSessionI::loadServers_async(const AMD_NodeSession_loadServersPtr& amdCB, con } Ice::StringSeq -NodeSessionI::getServers(const Ice::Current& current) const +NodeSessionI::getServers(const Ice::Current&) const { ServerEntrySeq servers = _database->getNode(_info->name)->getServers(); Ice::StringSeq names; diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 2a4ea190076..48a769a7f9d 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -56,7 +56,7 @@ class NullPermissionsVerifierI : public Glacier2::PermissionsVerifier { public: - bool checkPermissions(const string& userId, const string& password, string&, const Current&) const + bool checkPermissions(const string& /*userId*/, const string& /*password*/, string&, const Current&) const { return true; } @@ -119,7 +119,7 @@ public: { } - virtual ObjectPtr locate(const Current& c, LocalObjectPtr&) + virtual ObjectPtr locate(const Current&, LocalObjectPtr&) { return _servant; } @@ -999,7 +999,7 @@ RegistryI::createAdminSessionFromSecureConnection(const Current& current) } int -RegistryI::getSessionTimeout(const Ice::Current& current) const +RegistryI::getSessionTimeout(const Ice::Current& /*current*/) const { return _sessionTimeout; } @@ -1372,7 +1372,7 @@ RegistryI::registerReplicas(const InternalRegistryPrx& internalRegistry, } void -RegistryI::registerNodes(const InternalRegistryPrx& internalRegistry, const NodePrxSeq& nodes) +RegistryI::registerNodes(const InternalRegistryPrx& /*internalRegistry*/, const NodePrxSeq& nodes) { const string prefix("Node-"); diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp index a525058c518..69001ec0482 100644 --- a/cpp/src/IceGrid/ReplicaSessionI.cpp +++ b/cpp/src/IceGrid/ReplicaSessionI.cpp @@ -71,7 +71,7 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database, } void -ReplicaSessionI::keepAlive(const Ice::Current& current) +ReplicaSessionI::keepAlive(const Ice::Current&) { Lock sync(*this); if(_destroy) @@ -89,13 +89,13 @@ ReplicaSessionI::keepAlive(const Ice::Current& current) } int -ReplicaSessionI::getTimeout(const Ice::Current& current) const +ReplicaSessionI::getTimeout(const Ice::Current&) const { return _timeout; } void -ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer, const Ice::Current& current) +ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer, const Ice::Current&) { // // If it's a read only master, we don't setup the observer to not @@ -133,7 +133,7 @@ ReplicaSessionI::setDatabaseObserver(const DatabaseObserverPrx& observer, const } void -ReplicaSessionI::setEndpoints(const StringObjectProxyDict& endpoints, const Ice::Current& current) +ReplicaSessionI::setEndpoints(const StringObjectProxyDict& endpoints, const Ice::Current&) { { Lock sync(*this); @@ -147,7 +147,7 @@ ReplicaSessionI::setEndpoints(const StringObjectProxyDict& endpoints, const Ice: } void -ReplicaSessionI::registerWellKnownObjects(const ObjectInfoSeq& objects, const Ice::Current& current) +ReplicaSessionI::registerWellKnownObjects(const ObjectInfoSeq& objects, const Ice::Current&) { int serial; { diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index b83ec8fff88..027162ac042 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -37,7 +37,7 @@ ServerAdapterI::~ServerAdapterI() } void -ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current& current) +ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current&) { { Lock sync(*this); @@ -107,7 +107,7 @@ ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Cur } Ice::ObjectPrx -ServerAdapterI::getDirectProxy(const Ice::Current& current) const +ServerAdapterI::getDirectProxy(const Ice::Current&) const { Lock sync(*this); diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 62529899de0..0950f4cf04f 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -219,7 +219,7 @@ ServerCache::addCommunicator(const CommunicatorDescriptorPtr& comm, } void -ServerCache::removeCommunicator(const CommunicatorDescriptorPtr& comm, const ServerEntryPtr& entry) +ServerCache::removeCommunicator(const CommunicatorDescriptorPtr& comm, const ServerEntryPtr& /*entry*/) { for(AdapterDescriptorSeq::const_iterator q = comm->adapters.begin() ; q != comm->adapters.end(); ++q) { @@ -1056,7 +1056,7 @@ ServerEntry::allocated(const SessionIPtr& session) } void -ServerEntry::allocatedNoSync(const SessionIPtr& session) +ServerEntry::allocatedNoSync(const SessionIPtr& /*session*/) { { Lock sync(*this); @@ -1150,7 +1150,7 @@ ServerEntry::released(const SessionIPtr& session) } void -ServerEntry::releasedNoSync(const SessionIPtr& session) +ServerEntry::releasedNoSync(const SessionIPtr& /*session*/) { { Lock sync(*this); diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 49b52c3e795..e5cd3a437d4 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -889,13 +889,13 @@ ServerI::stop_async(const AMD_Server_stopPtr& amdCB, const Ice::Current&) } void -ServerI::sendSignal(const string& signal, const Ice::Current& current) +ServerI::sendSignal(const string& signal, const Ice::Current&) { _node->getActivator()->sendSignal(_id, signal); } void -ServerI::writeMessage(const string& message, Ice::Int fd, const Ice::Current& current) +ServerI::writeMessage(const string& message, Ice::Int fd, const Ice::Current&) { Lock sync(*this); checkDestroyed(); @@ -2466,8 +2466,13 @@ ServerI::checkNoRestart(const InternalServerDescriptorPtr& desc) } } +#ifndef _WIN32 void ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool update) +#else +void +ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*update*/) +#endif { #ifndef _WIN32 uid_t uid = getuid(); diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp index ed341505b9e..dae39705bf7 100644 --- a/cpp/src/IceGrid/SessionI.cpp +++ b/cpp/src/IceGrid/SessionI.cpp @@ -104,7 +104,7 @@ BaseSessionI::keepAlive(const Ice::Current& current) } void -BaseSessionI::destroyImpl(bool shutdown) +BaseSessionI::destroyImpl(bool /*shutdown*/) { Lock sync(*this); if(_destroyed) @@ -351,7 +351,7 @@ ClientSessionFactory::createGlacier2Session(const string& sessionId, const Glaci } SessionIPtr -ClientSessionFactory::createSessionServant(const string& userId, const Glacier2::SessionControlPrx& ctl) +ClientSessionFactory::createSessionServant(const string& userId, const Glacier2::SessionControlPrx&) { return new SessionI(userId, _database, _timer); } @@ -367,7 +367,7 @@ ClientSessionManagerI::ClientSessionManagerI(const ClientSessionFactoryPtr& fact } Glacier2::SessionPrx -ClientSessionManagerI::create(const string& user, const Glacier2::SessionControlPrx& ctl, const Ice::Current& current) +ClientSessionManagerI::create(const string& user, const Glacier2::SessionControlPrx& ctl, const Ice::Current&) { return _factory->createGlacier2Session(user, ctl); } @@ -379,7 +379,7 @@ ClientSSLSessionManagerI::ClientSSLSessionManagerI(const ClientSessionFactoryPtr Glacier2::SessionPrx ClientSSLSessionManagerI::create(const Glacier2::SSLInfo& info, const Glacier2::SessionControlPrx& ctl, - const Ice::Current& current) + const Ice::Current&) { string userDN; if(!info.certs.empty()) // TODO: Require userDN? diff --git a/cpp/src/IceGrid/Topics.cpp b/cpp/src/IceGrid/Topics.cpp index 389ea08d92c..62c582858ac 100644 --- a/cpp/src/IceGrid/Topics.cpp +++ b/cpp/src/IceGrid/Topics.cpp @@ -324,7 +324,7 @@ NodeObserverTopic::nodeInit(const NodeDynamicInfoSeq&, const Ice::Current&) } void -NodeObserverTopic::nodeUp(const NodeDynamicInfo& info, const Ice::Current& current) +NodeObserverTopic::nodeUp(const NodeDynamicInfo& info, const Ice::Current&) { Lock sync(*this); if(!_topic) @@ -345,7 +345,7 @@ NodeObserverTopic::nodeUp(const NodeDynamicInfo& info, const Ice::Current& curre } void -NodeObserverTopic::nodeDown(const string& name, const Ice::Current&) +NodeObserverTopic::nodeDown(const string& /*name*/, const Ice::Current&) { assert(false); } diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index 666b8d121de..0c7ca517942 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -85,7 +85,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp } #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - pair<const Byte*, const Byte*> ret(nullptr, nullptr); + pair<const Byte*, const Byte*> ret(static_cast<const Byte*>(nullptr), static_cast<const Byte*>(nullptr)); #else pair<const Byte*, const Byte*> ret(0, 0); #endif diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 5031718739e..657e31a1048 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -685,10 +685,10 @@ IcePatch2::decompressFile(const string& pa) fclose(fp); } +#ifndef _WIN32 void IcePatch2::setFileFlags(const string& pa, const FileInfo& info) { -#ifndef _WIN32 // Windows doesn't support the executable flag const string path = simplify(pa); IceUtilInternal::structstat buf; if(IceUtilInternal::stat(path, &buf) == -1) @@ -696,8 +696,13 @@ IcePatch2::setFileFlags(const string& pa, const FileInfo& info) throw "cannot stat `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } chmod(path.c_str(), info.executable ? buf.st_mode | S_IXUSR : buf.st_mode & ~S_IXUSR); -#endif } +#else // Windows doesn't support the executable flag +void +IcePatch2::setFileFlags(const string&, const FileInfo&) +{ +} +#endif static bool getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, GetFileInfoSeqCB* cb, diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index 8b80fb0d640..d4bb455241f 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -36,7 +36,11 @@ IceSSL::AcceptorI::getNativeInfo() #ifdef ICE_USE_IOCP IceInternal::AsyncInfo* +# ifndef NDEBUG IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation status) +# else +IceSSL::AcceptorI::getAsyncInfo(IceInternal::SocketOperation) +# endif { assert(status == IceInternal::SocketOperationRead); return &_info; diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp index 7b272b8810d..063ef73956e 100644 --- a/cpp/src/IceSSL/Instance.cpp +++ b/cpp/src/IceSSL/Instance.cpp @@ -80,7 +80,7 @@ extern "C" // OpenSSL mutex callback. // void -IceSSL_opensslLockCallback(int mode, int n, const char* file, int line) +IceSSL_opensslLockCallback(int mode, int n, const char* /*file*/, int /*line*/) { assert(locks); if(mode & CRYPTO_LOCK) @@ -1168,7 +1168,7 @@ IceSSL::Instance::parseProtocols(const StringSeq& protocols) } SSL_METHOD* -IceSSL::Instance::getMethod(int protocols) +IceSSL::Instance::getMethod(int /*protocols*/) { // // Despite its name, the SSLv23 method can negotiate SSL3, TLS1.0, TLS1.1, and TLS1.2. diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index d1cfada9660..03aecf207e6 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -25,7 +25,7 @@ extern "C" { ICE_DECLSPEC_EXPORT Ice::Plugin* -createIceSSL(const CommunicatorPtr& communicator, const string& name, const StringSeq& args) +createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const StringSeq& /*args*/) { PluginI* plugin = new PluginI(communicator); return plugin; diff --git a/cpp/src/IceSSL/TransceiverI.cpp b/cpp/src/IceSSL/TransceiverI.cpp index a4e21e73ceb..d936f279ace 100644 --- a/cpp/src/IceSSL/TransceiverI.cpp +++ b/cpp/src/IceSSL/TransceiverI.cpp @@ -645,7 +645,7 @@ IceSSL::TransceiverI::read(IceInternal::Buffer& buf) #ifdef ICE_USE_IOCP bool -IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buf) +IceSSL::TransceiverI::startWrite(IceInternal::Buffer& /*buf*/) { if(_state < StateConnected) { @@ -686,7 +686,7 @@ IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buf) } void -IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf) +IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& /*buf*/) { if(_state < StateConnected) { @@ -765,7 +765,7 @@ IceSSL::TransceiverI::startRead(IceInternal::Buffer& buf) } void -IceSSL::TransceiverI::finishRead(IceInternal::Buffer& buf) +IceSSL::TransceiverI::finishRead(IceInternal::Buffer& /*buf*/) { if(static_cast<int>(_read.count) == SOCKET_ERROR) { diff --git a/cpp/src/IceStorm/FreezeDB/FreezeDB.cpp b/cpp/src/IceStorm/FreezeDB/FreezeDB.cpp index e132a078f2a..7f54904fa4e 100644 --- a/cpp/src/IceStorm/FreezeDB/FreezeDB.cpp +++ b/cpp/src/IceStorm/FreezeDB/FreezeDB.cpp @@ -22,7 +22,7 @@ extern "C" { ICE_DECLSPEC_EXPORT ::Ice::Plugin* -createFreezeDB(const Ice::CommunicatorPtr& communicator, const string& name, const Ice::StringSeq& args) +createFreezeDB(const Ice::CommunicatorPtr& communicator, const string& /*name*/, const Ice::StringSeq& /*args*/) { return new IceStorm::FreezeDBPlugin(communicator); } diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp index cb3b5ba2192..8938aefea80 100644 --- a/cpp/src/IceStorm/NodeI.cpp +++ b/cpp/src/IceStorm/NodeI.cpp @@ -1096,7 +1096,7 @@ NodeI::destroy() // A node should only receive an observer init call if the node is // reorganizing and its not the coordinator. void -NodeI::checkObserverInit(Ice::Long generation) +NodeI::checkObserverInit(Ice::Long /*generation*/) { Lock sync(*this); if(_state != NodeStateReorganization) @@ -1140,7 +1140,7 @@ NodeI::startUpdate(Ice::Long& generation, const char* file, int line) } bool -NodeI::updateMaster(const char* file, int line) +NodeI::updateMaster(const char* /*file*/, int /*line*/) { bool majority = _observers->check(); diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index b60ead9bc5f..6e29cbf2df3 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -110,7 +110,7 @@ void ServiceI::start( const string& name, const CommunicatorPtr& communicator, - const StringSeq& args) + const StringSeq& /*args*/) { PropertiesPtr properties = communicator->getProperties(); @@ -422,7 +422,7 @@ ServiceI::start(const CommunicatorPtr& communicator, const ObjectAdapterPtr& publishAdapter, const string& name, const Ice::Identity& id, - const string& dbEnv) + const string& /*dbEnv*/) { // // For IceGrid we don't validate the properties as all sorts of diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 460e291c0ef..e51fb62e383 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -104,7 +104,7 @@ public: } virtual void - forward(const EventDataSeq& v, const Ice::Current& current) + forward(const EventDataSeq& v, const Ice::Current& /*current*/) { // The publish call does a cached read. _impl->publish(true, v); @@ -254,7 +254,7 @@ public: return _impl->getLinkProxy(); } - virtual void reap(const Ice::IdentitySeq& ids, const Ice::Current& current) + virtual void reap(const Ice::IdentitySeq& ids, const Ice::Current& /*current*/) { NodeIPtr node = _instance->node(); if(!node->updateMaster(__FILE__, __LINE__)) diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp index fb65e2400d7..cb8529cee04 100644 --- a/cpp/src/IceStorm/TransientTopicI.cpp +++ b/cpp/src/IceStorm/TransientTopicI.cpp @@ -83,7 +83,7 @@ public: } virtual void - forward(const EventDataSeq& v, const Ice::Current& current) + forward(const EventDataSeq& v, const Ice::Current& /*current*/) { _impl->publish(true, v); } diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp index bdb53910031..2477ed2c9a1 100644 --- a/cpp/src/IceXML/Parser.cpp +++ b/cpp/src/IceXML/Parser.cpp @@ -280,7 +280,7 @@ IceXML::DocumentBuilder::startElement(const string& name, const Attributes& attr } void -IceXML::DocumentBuilder::endElement(const string& name, int, int) +IceXML::DocumentBuilder::endElement(const string&, int, int) { assert(!_nodeStack.empty()); _nodeStack.pop_front(); diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index e98b2d8aa05..65cc88f6748 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -31,8 +31,7 @@ using namespace std; using namespace Slice; using namespace IceUtil; using namespace IceUtilInternal; - - + namespace { @@ -2457,7 +2456,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out, const string& package, const TypePtr& type, bool optional, - int tag, + int /*tag*/, const string& param, bool marshal, int& iter, diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index de9f2bc15ab..9ab5d9acffd 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -362,7 +362,7 @@ Slice::Python::CodeVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Python::CodeVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Python::CodeVisitor::visitModuleEnd(const ModulePtr&) { assert(!_moduleStack.empty()); _out << sp << nl << "# End of module " << _moduleStack.front(); diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index a79c0713502..4575457d935 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -177,7 +177,7 @@ Slice::Ruby::CodeVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Ruby::CodeVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Ruby::CodeVisitor::visitModuleEnd(const ModulePtr&) { _out.dec(); _out << nl << "end"; @@ -1431,7 +1431,7 @@ Slice::Ruby::CodeVisitor::getInitializer(const TypePtr& p) } void -Slice::Ruby::CodeVisitor::writeHash(const string& name, const TypePtr& p, int& iter) +Slice::Ruby::CodeVisitor::writeHash(const string& name, const TypePtr&, int&) { _out << nl << "_h = 5 * _h + " << name << ".hash"; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 336cd1e6cbe..e0633bcc1be 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -633,7 +633,7 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -641,7 +641,7 @@ Slice::Gen::TypesVisitor::visitModuleEnd(const ModulePtr& p) } bool -Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p) +Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr&) { return false; } @@ -1361,7 +1361,7 @@ Slice::Gen::ProxyDeclVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::ProxyDeclVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::ProxyDeclVisitor::visitUnitEnd(const UnitPtr&) { H << sp << nl << '}'; } @@ -1382,7 +1382,7 @@ Slice::Gen::ProxyDeclVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::ProxyDeclVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::ProxyDeclVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; } @@ -1423,7 +1423,7 @@ Slice::Gen::ProxyVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::ProxyVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::ProxyVisitor::visitUnitEnd(const UnitPtr&) { H << sp << nl << '}'; } @@ -1446,7 +1446,7 @@ Slice::Gen::ProxyVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::ProxyVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::ProxyVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -2461,7 +2461,7 @@ Slice::Gen::DelegateVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::DelegateVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::DelegateVisitor::visitUnitEnd(const UnitPtr&) { H << sp << nl << '}'; } @@ -2484,7 +2484,7 @@ Slice::Gen::DelegateVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::DelegateVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::DelegateVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -2532,7 +2532,7 @@ Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDefPtr& p) } void -Slice::Gen::DelegateVisitor::visitClassDefEnd(const ClassDefPtr& p) +Slice::Gen::DelegateVisitor::visitClassDefEnd(const ClassDefPtr&) { H << eb << ';'; @@ -2590,7 +2590,7 @@ Slice::Gen::DelegateMVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::DelegateMVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::DelegateMVisitor::visitUnitEnd(const UnitPtr&) { H << sp << nl << '}'; } @@ -2613,7 +2613,7 @@ Slice::Gen::DelegateMVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::DelegateMVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::DelegateMVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -2663,7 +2663,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) } void -Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDefPtr& p) +Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDefPtr&) { H << eb << ';'; @@ -2861,7 +2861,7 @@ Slice::Gen::DelegateDVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::DelegateDVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::DelegateDVisitor::visitUnitEnd(const UnitPtr&) { H << sp << nl << '}'; } @@ -2884,7 +2884,7 @@ Slice::Gen::DelegateDVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::DelegateDVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::DelegateDVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -2934,7 +2934,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) } void -Slice::Gen::DelegateDVisitor::visitClassDefEnd(const ClassDefPtr& p) +Slice::Gen::DelegateDVisitor::visitClassDefEnd(const ClassDefPtr&) { H << eb << ';'; @@ -3209,7 +3209,7 @@ Slice::Gen::ObjectDeclVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::ObjectDeclVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::ObjectDeclVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; C << sp << nl << "}"; @@ -3272,7 +3272,7 @@ Slice::Gen::ObjectVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::ObjectVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::ObjectVisitor::visitModuleEnd(const ModulePtr&) { H << sp; H << nl << '}'; @@ -3942,7 +3942,17 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p) C.dec(); C << nl << "public:"; C.inc(); - C << sp << nl << "virtual ::Ice::ObjectPtr" << nl << "create(const ::std::string& type)"; + C.zeroIndent(); + C << nl << "#ifndef NDEBUG"; + C.restoreIndent(); + C << sp << "virtual ::Ice::ObjectPtr" << nl << "create(const ::std::string& type)"; + C.zeroIndent(); + C << nl << "#else"; + C.restoreIndent(); + C << sp << "virtual ::Ice::ObjectPtr" << nl << "create(const ::std::string&)"; + C.zeroIndent(); + C << nl <<"#endif"; + C.restoreIndent(); C << sb; C << nl << "assert(type == " << scoped << "::ice_staticId());"; C << nl << "return new " << scoped << ';'; @@ -4866,7 +4876,7 @@ Slice::Gen::AsyncCallbackVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::AsyncCallbackVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::AsyncCallbackVisitor::visitModuleEnd(const ModulePtr&) { _useWstring = resetUseWstring(_useWstringHist); @@ -4881,7 +4891,7 @@ Slice::Gen::AsyncCallbackVisitor::visitClassDefStart(const ClassDefPtr& p) } void -Slice::Gen::AsyncCallbackVisitor::visitClassDefEnd(const ClassDefPtr& p) +Slice::Gen::AsyncCallbackVisitor::visitClassDefEnd(const ClassDefPtr&) { _useWstring = resetUseWstring(_useWstringHist); } @@ -4937,7 +4947,7 @@ Slice::Gen::AsyncCallbackTemplateVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::AsyncCallbackTemplateVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::AsyncCallbackTemplateVisitor::visitModuleEnd(const ModulePtr&) { _useWstring = resetUseWstring(_useWstringHist); @@ -4952,7 +4962,7 @@ Slice::Gen::AsyncCallbackTemplateVisitor::visitClassDefStart(const ClassDefPtr& } void -Slice::Gen::AsyncCallbackTemplateVisitor::visitClassDefEnd(const ClassDefPtr& p) +Slice::Gen::AsyncCallbackTemplateVisitor::visitClassDefEnd(const ClassDefPtr&) { _useWstring = resetUseWstring(_useWstringHist); } @@ -5390,7 +5400,7 @@ Slice::Gen::ImplVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::ImplVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::ImplVisitor::visitModuleEnd(const ModulePtr&) { H << sp; H << nl << '}'; @@ -5636,7 +5646,7 @@ Slice::Gen::AsyncVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::AsyncVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::AsyncVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -5792,7 +5802,7 @@ Slice::Gen::AsyncImplVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::AsyncImplVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::AsyncImplVisitor::visitUnitEnd(const UnitPtr&) { H << sp << nl << '}'; } @@ -5815,7 +5825,7 @@ Slice::Gen::AsyncImplVisitor::visitModuleStart(const ModulePtr& p) } void -Slice::Gen::AsyncImplVisitor::visitModuleEnd(const ModulePtr& p) +Slice::Gen::AsyncImplVisitor::visitModuleEnd(const ModulePtr&) { H << sp << nl << '}'; @@ -6364,7 +6374,7 @@ Slice::Gen::MetaDataVisitor::visitConst(const ConstPtr& p) void Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const StringList& metaData, - const string& file, const string& line, bool inParam) + const string& file, const string& line, bool /*inParam*/) { static const string prefix = "cpp:"; for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p) diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index f7c3c0dac99..b3d2704bf8f 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -46,7 +46,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 06852ab44fa..d2d857e7289 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -2612,7 +2612,7 @@ Slice::Gen::CompactIdVisitor::CompactIdVisitor(IceUtilInternal::Output& out) : } bool -Slice::Gen::CompactIdVisitor::visitUnitStart(const UnitPtr& p) +Slice::Gen::CompactIdVisitor::visitUnitStart(const UnitPtr&) { _out << sp << nl << "namespace IceCompactId"; _out << sb; @@ -2620,7 +2620,7 @@ Slice::Gen::CompactIdVisitor::visitUnitStart(const UnitPtr& p) } void -Slice::Gen::CompactIdVisitor::visitUnitEnd(const UnitPtr& p) +Slice::Gen::CompactIdVisitor::visitUnitEnd(const UnitPtr&) { _out << eb; } @@ -6497,7 +6497,7 @@ Slice::Gen::AsyncVisitor::visitModuleEnd(const ModulePtr&) } bool -Slice::Gen::AsyncVisitor::visitClassDefStart(const ClassDefPtr& p) +Slice::Gen::AsyncVisitor::visitClassDefStart(const ClassDefPtr&) { return true; } diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index 051fa4d1539..bc80ce86701 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -46,7 +46,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 6b9877582cc..a42d692297c 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -54,7 +54,7 @@ string ICE_ENCODING_COMPARE = "Freeze::IceEncodingCompare"; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); @@ -76,7 +76,7 @@ public: return true; } - virtual void visitModuleEnd(const ModulePtr& p) + virtual void visitModuleEnd(const ModulePtr&) { resetUseWstring(); } @@ -1277,7 +1277,7 @@ writeIndexC(const TypePtr& type, const TypePtr& memberType, const string& member } void -writeIndex(const string& n, const UnitPtr& u, const Index& index, Output& H, Output& C, const string& dllExport) +writeIndex(const string& /*n*/, const UnitPtr& u, const Index& index, Output& H, Output& C, const string& dllExport) { string absolute = index.name; if(absolute.find("::") == 0) diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index 697331084fc..183d262b92e 100644 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -50,7 +50,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index 295846612c9..32c948facbf 100644 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -208,7 +208,7 @@ Slice::GeneratorBase::~GeneratorBase() // is created if necessary) and write the HTML header into the file. // void -Slice::GeneratorBase::openDoc(const string& file, const string& title, const string& header, const string& footer) +Slice::GeneratorBase::openDoc(const string& file, const string& title, const string& header, const string& /*footer*/) { makeDir(_dir); openStream(_dir + "/" + file); @@ -830,7 +830,7 @@ Slice::GeneratorBase::printSearch() } void -Slice::GeneratorBase::printLogo(const ContainedPtr& c, const ContainerPtr& container, bool forEnum) +Slice::GeneratorBase::printLogo(const ContainedPtr& /*c*/, const ContainerPtr& container, bool forEnum) { string imageDir = getImageDir(); if(!imageDir.empty()) @@ -1294,7 +1294,7 @@ Slice::GeneratorBase::closeStream() } string -Slice::GeneratorBase::containedToId(const ContainedPtr& contained, bool asTarget) +Slice::GeneratorBase::containedToId(const ContainedPtr& contained, bool /*asTarget*/) { assert(contained); @@ -1834,7 +1834,7 @@ Slice::FileVisitor::FileVisitor(Files& files) } bool -Slice::FileVisitor::visitUnitStart(const UnitPtr& u) +Slice::FileVisitor::visitUnitStart(const UnitPtr&) { return true; } @@ -1897,7 +1897,7 @@ Slice::StartPageVisitor::StartPageVisitor(const Files& files) } bool -Slice::StartPageVisitor::visitUnitStart(const UnitPtr& unit) +Slice::StartPageVisitor::visitUnitStart(const UnitPtr&) { return true; } @@ -2999,7 +2999,7 @@ Slice::PageVisitor::PageVisitor(const Files& files) } bool -Slice::PageVisitor::visitUnitStart(const UnitPtr& unit) +Slice::PageVisitor::visitUnitStart(const UnitPtr&) { return true; } diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp index 4d4dba8d0e9..011bdd9ca97 100644 --- a/cpp/src/slice2html/Main.cpp +++ b/cpp/src/slice2html/Main.cpp @@ -48,7 +48,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 6e7586004c0..61cf44c18fc 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -151,7 +151,7 @@ Slice::JavaVisitor::getParamsProxy(const OperationPtr& op, const string& package } vector<string> -Slice::JavaVisitor::getInOutParams(const OperationPtr& op, const string& package, ParamDir paramType, bool proxy, +Slice::JavaVisitor::getInOutParams(const OperationPtr& op, const string& package, ParamDir paramType, bool /*proxy*/, bool optionalMapping) { vector<string> params; @@ -186,7 +186,7 @@ Slice::JavaVisitor::getParamsAsync(const OperationPtr& op, const string& package } vector<string> -Slice::JavaVisitor::getParamsAsyncCB(const OperationPtr& op, const string& package, bool amd, bool optionalMapping) +Slice::JavaVisitor::getParamsAsyncCB(const OperationPtr& op, const string& package, bool /*amd*/, bool optionalMapping) { vector<string> params; @@ -1995,7 +1995,7 @@ Slice::JavaVisitor::writeDocCommentParam(Output& out, const OperationPtr& p, Par } } -Slice::Gen::Gen(const string& name, const string& base, const vector<string>& includePaths, const string& dir) : +Slice::Gen::Gen(const string& /*name*/, const string& base, const vector<string>& includePaths, const string& dir) : _base(base), _includePaths(includePaths), _dir(dir) @@ -5348,7 +5348,7 @@ Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p) } void -Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p) +Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr&) { Output& out = output(); out << eb; @@ -5676,7 +5676,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) } void -Slice::Gen::DelegateMVisitor::writeOperation(const ClassDefPtr& p, const string& package, const OperationPtr& op, +Slice::Gen::DelegateMVisitor::writeOperation(const ClassDefPtr& /*p*/, const string& package, const OperationPtr& op, bool optionalMapping) { Output& out = output(); diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 030b98d373f..d7b1e9d14fd 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -47,7 +47,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 87cc8e671c7..f6a50fa4f3e 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1369,7 +1369,7 @@ CodeVisitor::writeConstructorParams(const MemberInfoList& members) } string -CodeVisitor::getOperationMode(Slice::Operation::Mode mode, bool ns) +CodeVisitor::getOperationMode(Slice::Operation::Mode mode, bool /*ns*/) { ostringstream ostr; ostr << static_cast<int>(mode); @@ -1533,7 +1533,7 @@ Init init; } static void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp index 4a4ca29b5b5..d09c433dde4 100644 --- a/cpp/src/slice2py/Main.cpp +++ b/cpp/src/slice2py/Main.cpp @@ -64,7 +64,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp index feba75e6967..5b984148bee 100644 --- a/cpp/src/slice2rb/Main.cpp +++ b/cpp/src/slice2rb/Main.cpp @@ -61,7 +61,7 @@ Init init; } void -interruptedCallback(int signal) +interruptedCallback(int /*signal*/) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex); diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp index be7f8493939..687b54905c6 100644 --- a/cpp/test/Freeze/evictor/Client.cpp +++ b/cpp/test/Freeze/evictor/Client.cpp @@ -449,7 +449,7 @@ private: int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, bool transactional, bool shutdown) +run(int, char**, const Ice::CommunicatorPtr& communicator, bool transactional, bool shutdown) { string ref = "factory:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index 199639d9915..cfe848340fa 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -18,7 +18,11 @@ class AccountFactory : public Ice::ObjectFactory public: virtual Ice::ObjectPtr +#ifndef NDEBUG create(const string& type) +#else + create(const string&) +#endif { assert(type == "::Test::Account"); return new Test::AccountI; @@ -36,7 +40,11 @@ class ServantFactory : public Ice::ObjectFactory public: virtual Ice::ObjectPtr +#ifndef NDEBUG create(const string& type) +#else + create(const string&) +#endif { assert(type == "::Test::Servant"); return new Test::ServantI; @@ -54,7 +62,11 @@ class FacetFactory : public Ice::ObjectFactory public: virtual Ice::ObjectPtr +#ifndef NDEBUG create(const string& type) +#else + create(const string&) +#endif { assert(type == "::Test::Facet"); return new Test::FacetI; @@ -66,7 +78,7 @@ public: } }; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) +run(int, char**, const Ice::CommunicatorPtr& communicator, const string& envName) { communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); diff --git a/cpp/test/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp index 56f18b1190e..83ef83c06ce 100644 --- a/cpp/test/Freeze/evictor/TestI.cpp +++ b/cpp/test/Freeze/evictor/TestI.cpp @@ -291,7 +291,7 @@ Test::ServantI::setValueAsync_async(const AMD_Servant_setValueAsyncPtr& __cb, In } void -Test::ServantI::releaseAsync(const Current& current) const +Test::ServantI::releaseAsync(const Current&) const { Monitor<Mutex>::Lock sync(*this); // @@ -336,14 +336,14 @@ Test::ServantI::removeFacet(const string& name, const Current& current) const Ice::Int -Test::ServantI::getTransientValue(const Current& current) const +Test::ServantI::getTransientValue(const Current&) const { Monitor<Mutex>::Lock sync(*this); return _transientValue; } void -Test::ServantI::setTransientValue(Ice::Int val, const Current& current) +Test::ServantI::setTransientValue(Ice::Int val, const Current&) { Monitor<Mutex>::Lock sync(*this); _transientValue = val; @@ -495,7 +495,7 @@ public: } virtual void - initialize(const ObjectAdapterPtr& adapter, const Identity& ident, const string& facet, const ObjectPtr& servant) + initialize(const ObjectAdapterPtr&, const Identity&, const string&, const ObjectPtr& servant) { Test::ServantI* servantI = dynamic_cast<Test::ServantI*>(servant.get()); if(servantI != 0) @@ -592,7 +592,7 @@ Test::RemoteEvictorI::getServant(const string& id, const Current&) void -Test::RemoteEvictorI::saveNow(const Current& current) +Test::RemoteEvictorI::saveNow(const Current&) { _evictor->getIterator("", 1); } diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp index 20feaea8a73..fe914d08bf0 100644 --- a/cpp/test/Glacier2/attack/Client.cpp +++ b/cpp/test/Glacier2/attack/Client.cpp @@ -42,7 +42,7 @@ main(int argc, char* argv[]) } int -AttackClient::run(int argc, char* argv[]) +AttackClient::run(int, char**) { cout << "getting router... " << flush; ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 176a35cd892..a862caef3d4 100644 --- a/cpp/test/Glacier2/attack/Server.cpp +++ b/cpp/test/Glacier2/attack/Server.cpp @@ -56,7 +56,7 @@ main(int argc, char* argv[]) } int -BackendServer::run(int argc, char* argv[]) +BackendServer::run(int, char**) { communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); diff --git a/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp b/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp index ac6e6f6dc9b..d1be7baa0bf 100644 --- a/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/BackendI.cpp @@ -15,7 +15,7 @@ using namespace Ice; using namespace Test; void -BackendI::check(const Ice::Current& current) +BackendI::check(const Ice::Current&) { } diff --git a/cpp/test/Glacier2/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp index 48f0501033b..95e8d8669dd 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/Server.cpp @@ -67,7 +67,7 @@ public: } virtual void - findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string& id, const Current& current) const + findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const { cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); } diff --git a/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp b/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp index 749f06f98c7..9f6c6da2cb7 100644 --- a/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/SessionI.cpp @@ -35,7 +35,7 @@ SessionI::SessionI(const Glacier2::SessionControlPrx& sessionControl, const Test } void -SessionI::destroySession(const Ice::Current& current) +SessionI::destroySession(const Ice::Current&) { _sessionControl->destroy(); } diff --git a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp index b21fa9633b6..1c42667f4e8 100644 --- a/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/TestControllerI.cpp @@ -57,7 +57,7 @@ TestControllerI::TestControllerI() void TestControllerI::step(const Glacier2::SessionPrx& currentSession, const TestToken& currentState, TestToken& newState, - const Ice::Current& current) + const Ice::Current&) { switch(currentState.code) { diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp index 54ecf771b17..08af409704f 100644 --- a/cpp/test/Glacier2/override/Client.cpp +++ b/cpp/test/Glacier2/override/Client.cpp @@ -45,7 +45,7 @@ main(int argc, char* argv[]) } int -CallbackClient::run(int argc, char* argv[]) +CallbackClient::run(int, char**) { ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); diff --git a/cpp/test/Glacier2/override/Server.cpp b/cpp/test/Glacier2/override/Server.cpp index 7622396bd91..24279dfcb38 100644 --- a/cpp/test/Glacier2/override/Server.cpp +++ b/cpp/test/Glacier2/override/Server.cpp @@ -36,7 +36,7 @@ main(int argc, char* argv[]) } int -CallbackServer::run(int argc, char* argv[]) +CallbackServer::run(int, char**) { communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp index eb02eb2fc1a..ea70dd83e7b 100644 --- a/cpp/test/Glacier2/router/Server.cpp +++ b/cpp/test/Glacier2/router/Server.cpp @@ -35,7 +35,7 @@ main(int argc, char* argv[]) } int -CallbackServer::run(int argc, char* argv[]) +CallbackServer::run(int, char**) { communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp index 45a9230aa41..b268341b63d 100644 --- a/cpp/test/Glacier2/sessionControl/Client.cpp +++ b/cpp/test/Glacier2/sessionControl/Client.cpp @@ -42,7 +42,7 @@ main(int argc, char* argv[]) } int -SessionControlClient::run(int argc, char* argv[]) +SessionControlClient::run(int, char**) { cout << "getting router... " << flush; ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp index 8e9cddb02dc..de128b44022 100644 --- a/cpp/test/Glacier2/sessionControl/Server.cpp +++ b/cpp/test/Glacier2/sessionControl/Server.cpp @@ -30,7 +30,7 @@ main(int argc, char* argv[]) } int -SessionControlServer::run(int argc, char* argv[]) +SessionControlServer::run(int, char**) { communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); diff --git a/cpp/test/Glacier2/sessionControl/SessionI.cpp b/cpp/test/Glacier2/sessionControl/SessionI.cpp index 51554382c48..2634b5a1aa7 100644 --- a/cpp/test/Glacier2/sessionControl/SessionI.cpp +++ b/cpp/test/Glacier2/sessionControl/SessionI.cpp @@ -63,7 +63,7 @@ SessionI::SessionI(const Glacier2::SessionControlPrx& sessionControl) : } void -SessionI::destroyFromClient_async(const Test::AMD_Session_destroyFromClientPtr& cb, const Ice::Current& current) +SessionI::destroyFromClient_async(const Test::AMD_Session_destroyFromClientPtr& cb, const Ice::Current&) { DestroyCBPtr asyncCB = new DestroyCB(cb); Glacier2::Callback_SessionControl_destroyPtr amiCB = Glacier2::newCallback_SessionControl_destroy(asyncCB, diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp index 69776884948..f06067c4590 100644 --- a/cpp/test/Glacier2/sessionHelper/Client.cpp +++ b/cpp/test/Glacier2/sessionHelper/Client.cpp @@ -46,7 +46,7 @@ public: virtual void dispatch(const Ice::DispatcherCallPtr& call, - const Ice::ConnectionPtr& conn) + const Ice::ConnectionPtr&) { IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor); if(_queue.empty()) @@ -110,14 +110,14 @@ class SuccessSessionCallback : public Glacier2::SessionCallback public: virtual void - connected(const Glacier2::SessionHelperPtr& session) + connected(const Glacier2::SessionHelperPtr&) { cout << "ok" << endl; instance->notify(); } virtual void - disconnected(const Glacier2::SessionHelperPtr& session) + disconnected(const Glacier2::SessionHelperPtr&) { cout << "ok" << endl; instance->notify(); @@ -142,19 +142,19 @@ class AfterShutdownSessionCallback : public Glacier2::SessionCallback public: virtual void - connected(const Glacier2::SessionHelperPtr& session) + connected(const Glacier2::SessionHelperPtr&) { test(false); } virtual void - disconnected(const Glacier2::SessionHelperPtr& session) + disconnected(const Glacier2::SessionHelperPtr&) { test(false); } virtual void - connectFailed(const Glacier2::SessionHelperPtr& session, const Ice::Exception& ex) + connectFailed(const Glacier2::SessionHelperPtr&, const Ice::Exception& ex) { try { diff --git a/cpp/test/Glacier2/sessionHelper/Server.cpp b/cpp/test/Glacier2/sessionHelper/Server.cpp index fac7fa68782..48004194649 100644 --- a/cpp/test/Glacier2/sessionHelper/Server.cpp +++ b/cpp/test/Glacier2/sessionHelper/Server.cpp @@ -51,7 +51,7 @@ public: } int -SessionHelperServer::run(int argc, char* argv[]) +SessionHelperServer::run(int, char**) { communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp index 063b8772bd5..83c1bdea0af 100644 --- a/cpp/test/Glacier2/ssl/Client.cpp +++ b/cpp/test/Glacier2/ssl/Client.cpp @@ -39,7 +39,7 @@ main(int argc, char* argv[]) } int -CallbackClient::run(int argc, char* argv[]) +CallbackClient::run(int, char**) { Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast( communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347")); diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp index 87d75e86084..1a5e56f6d20 100644 --- a/cpp/test/Glacier2/ssl/Server.cpp +++ b/cpp/test/Glacier2/ssl/Server.cpp @@ -43,7 +43,7 @@ class PermissionsVerifierI : public Glacier2::PermissionsVerifier public: virtual bool - checkPermissions(const string& userId, const string& password, string& reason, const Ice::Current& current) const + checkPermissions(const string& userId, const string&, string&, const Ice::Current& current) const { testContext(userId == "ssl", current.ctx); return true; @@ -172,7 +172,7 @@ main(int argc, char* argv[]) } int -SessionServer::run(int argc, char* argv[]) +SessionServer::run(int, char**) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints( "SessionServer", "tcp -h 127.0.0.1 -p 12350"); diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp index 47583549b35..3661acd9225 100644 --- a/cpp/test/Glacier2/staticFiltering/Client.cpp +++ b/cpp/test/Glacier2/staticFiltering/Client.cpp @@ -44,7 +44,7 @@ main(int argc, char* argv[]) } int -AttackClient::run(int argc, char* argv[]) +AttackClient::run(int, char**) { ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp index 792aa8eacbb..e5a1648d373 100644 --- a/cpp/test/Glacier2/staticFiltering/Server.cpp +++ b/cpp/test/Glacier2/staticFiltering/Server.cpp @@ -65,7 +65,7 @@ public: } virtual void - findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string& id, const Current& current) const + findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb, const string&, const Current&) const { cb->ice_response(_adapter->createDirectProxy(_adapter->getCommunicator()->stringToIdentity("dummy"))); } @@ -124,7 +124,7 @@ main(int argc, char* argv[]) } int -BackendServer::run(int argc, char* argv[]) +BackendServer::run(int, char**) { string endpoints = communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", "tcp -p 12010:ssl -p 12011"); diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index 9bc445e585a..defde6a735a 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -20,7 +20,7 @@ using namespace Ice; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { TestIntfPrx allTests(const CommunicatorPtr&); TestIntfPrx obj = allTests(communicator); diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 5f8f66605ba..cb699c1304f 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -19,7 +19,7 @@ using namespace Ice; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp index ed10051dcd7..3f87d4eb86a 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp @@ -39,7 +39,7 @@ ServantLocatorI::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie } void -ServantLocatorI::finished(const Ice::Current& current, const Ice::ObjectPtr& servant, +ServantLocatorI::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr& cookie) { test(!_deactivated); diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index e9ab9171ffd..33d7e89812a 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Ice; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/admin/Client.cpp b/cpp/test/Ice/admin/Client.cpp index da01fe64afe..41ea61ce0de 100644 --- a/cpp/test/Ice/admin/Client.cpp +++ b/cpp/test/Ice/admin/Client.cpp @@ -16,7 +16,7 @@ using namespace std; DEFINE_TEST("client") int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp index 0551cd02189..4e12b114257 100644 --- a/cpp/test/Ice/admin/Server.cpp +++ b/cpp/test/Ice/admin/Server.cpp @@ -16,7 +16,7 @@ using namespace std; DEFINE_TEST("server") int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 4fdfb66dd44..ae89f6b6368 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -375,7 +375,7 @@ public: { } - void isA(bool r) + void isA(bool) { test(false); } @@ -385,12 +385,12 @@ public: test(false); } - void id(const string& id) + void id(const string&) { test(false); } - void ids(const Ice::StringSeq& ids) + void ids(const Ice::StringSeq&) { test(false); } @@ -412,7 +412,7 @@ public: called(); } - void noEx(const Ice::Exception& ex) + void noEx(const Ice::Exception&) { test(false); } @@ -427,27 +427,27 @@ public: { } - void isA(bool r, const CookiePtr& cookie) + void isA(bool, const CookiePtr&) { test(false); } - void ping(const CookiePtr& cookie) + void ping(const CookiePtr&) { test(false); } - void id(const string& id, const CookiePtr& cookie) + void id(const string&, const CookiePtr&) { test(false); } - void ids(const Ice::StringSeq& ids, const CookiePtr& cookie) + void ids(const Ice::StringSeq&, const CookiePtr&) { test(false); } - void op(const CookiePtr& cookie) + void op(const CookiePtr&) { test(false); } @@ -466,7 +466,7 @@ public: called(); } - void noEx(const Ice::Exception& ex, const CookiePtr& cookie) + void noEx(const Ice::Exception&, const CookiePtr&) { test(false); } @@ -533,11 +533,11 @@ public: { } - void ex(const Ice::Exception& ex) + void ex(const Ice::Exception&) { } - void exWC(const Ice::Exception& ex, const CookiePtr&) + void exWC(const Ice::Exception&, const CookiePtr&) { } @@ -670,17 +670,17 @@ public: called(); } - void sentAsync(const Ice::AsyncResultPtr& result) + void sentAsync(const Ice::AsyncResultPtr&) { test(false); } - void sent(bool sentSynchronously) + void sent(bool) { test(false); } - void sentWC(bool sentSynchronously, const CookiePtr& cookie) + void sentWC(bool, const CookiePtr&) { test(false); } @@ -703,7 +703,7 @@ public: { } - void opAsync(const Ice::AsyncResultPtr& r) + void opAsync(const Ice::AsyncResultPtr&) { called(); throwEx(); @@ -729,24 +729,24 @@ public: { } - void ex(const Ice::Exception& ex) + void ex(const Ice::Exception&) { called(); throwEx(); } - void exWC(const Ice::Exception& ex, const CookiePtr&) + void exWC(const Ice::Exception&, const CookiePtr&) { called(); throwEx(); } - void noEx(const Ice::Exception& ex) + void noEx(const Ice::Exception&) { test(false); } - void noExWC(const Ice::Exception& ex, const CookiePtr&) + void noExWC(const Ice::Exception&, const CookiePtr&) { test(false); } diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp index 8f4319fc795..80ab27d04f9 100644 --- a/cpp/test/Ice/ami/Client.cpp +++ b/cpp/test/Ice/ami/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp index d480ee85390..18e33f76269 100644 --- a/cpp/test/Ice/ami/Server.cpp +++ b/cpp/test/Ice/ami/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011"); diff --git a/cpp/test/Ice/ami/TestI.cpp b/cpp/test/Ice/ami/TestI.cpp index a4cc8a8ef1f..f2a45d308c3 100644 --- a/cpp/test/Ice/ami/TestI.cpp +++ b/cpp/test/Ice/ami/TestI.cpp @@ -24,7 +24,7 @@ TestIntfI::op(const Ice::Current&) } int -TestIntfI::opWithResult(const Ice::Current& current) +TestIntfI::opWithResult(const Ice::Current&) { return 15; } @@ -36,7 +36,7 @@ TestIntfI::opWithUE(const Ice::Current&) } void -TestIntfI::opWithPayload(const Ice::ByteSeq&, const Ice::Current& current) +TestIntfI::opWithPayload(const Ice::ByteSeq&, const Ice::Current&) { } diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp index f986d8262c1..e4d2fecf846 100644 --- a/cpp/test/Ice/background/AllTests.cpp +++ b/cpp/test/Ice/background/AllTests.cpp @@ -87,7 +87,7 @@ public: } void - sent(bool ss) + sent(bool) { _sent.called(); } diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp index 102d2b1b4ad..bd92bb8cfc0 100644 --- a/cpp/test/Ice/background/Client.cpp +++ b/cpp/test/Ice/background/Client.cpp @@ -16,7 +16,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { BackgroundPrx allTests(const Ice::CommunicatorPtr&); BackgroundPrx background = allTests(communicator); diff --git a/cpp/test/Ice/background/PluginI.cpp b/cpp/test/Ice/background/PluginI.cpp index 936b57b7ed8..4321795bf73 100644 --- a/cpp/test/Ice/background/PluginI.cpp +++ b/cpp/test/Ice/background/PluginI.cpp @@ -42,7 +42,7 @@ extern "C" { ICE_DECLSPEC_EXPORT Ice::Plugin* -createTestTransport(const Ice::CommunicatorPtr& communicator, const string& name, const Ice::StringSeq& args) +createTestTransport(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&) { return new TestPluginI(communicator); } diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index db5c44ee7a3..0ae0fcd55f2 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -23,7 +23,7 @@ class LocatorI : public Ice::Locator public: virtual void - findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& response, const string& adapter, + findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& response, const string&, const Ice::Current& current) const { _controller->checkCallPause(current); @@ -96,7 +96,7 @@ private: int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011"); diff --git a/cpp/test/Ice/binding/Client.cpp b/cpp/test/Ice/binding/Client.cpp index f8aa8a77a3a..b5dfab5b94d 100644 --- a/cpp/test/Ice/binding/Client.cpp +++ b/cpp/test/Ice/binding/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index a5251728ce3..d1ad909dd8c 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index b1e67ef5139..e7e6e277e1a 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -36,7 +36,7 @@ RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpt } void -RemoteCommunicatorI::deactivateObjectAdapter(const RemoteObjectAdapterPrx& adapter, const Current& current) +RemoteCommunicatorI::deactivateObjectAdapter(const RemoteObjectAdapterPrx& adapter, const Current&) { adapter->deactivate(); // Collocated call } diff --git a/cpp/test/Ice/checksum/AllTests.cpp b/cpp/test/Ice/checksum/AllTests.cpp index c5425a56c08..9783fedc044 100644 --- a/cpp/test/Ice/checksum/AllTests.cpp +++ b/cpp/test/Ice/checksum/AllTests.cpp @@ -15,7 +15,7 @@ using namespace std; Test::ChecksumPrx -allTests(const Ice::CommunicatorPtr& communicator, bool collocated) +allTests(const Ice::CommunicatorPtr& communicator, bool) { string ref = "test:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); diff --git a/cpp/test/Ice/checksum/Client.cpp b/cpp/test/Ice/checksum/Client.cpp index 2b8b200eb38..a3a32590c7e 100644 --- a/cpp/test/Ice/checksum/Client.cpp +++ b/cpp/test/Ice/checksum/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Test::ChecksumPrx allTests(const Ice::CommunicatorPtr&, bool); Test::ChecksumPrx checksum = allTests(communicator, false); diff --git a/cpp/test/Ice/checksum/server/Server.cpp b/cpp/test/Ice/checksum/server/Server.cpp index 8083a70ed58..e222e9c1d7c 100644 --- a/cpp/test/Ice/checksum/server/Server.cpp +++ b/cpp/test/Ice/checksum/server/Server.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/custom/Client.cpp b/cpp/test/Ice/custom/Client.cpp index dfea0b0e1d3..4bd4b845ea3 100644 --- a/cpp/test/Ice/custom/Client.cpp +++ b/cpp/test/Ice/custom/Client.cpp @@ -15,7 +15,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Test::TestIntfPrx allTests(const Ice::CommunicatorPtr&, bool); Test::TestIntfPrx test = allTests(communicator, false); diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index 8982acd2e01..a0ffcf7ff90 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -16,7 +16,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new TestIntfI(communicator), communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index f1c17ac9d41..184692034a5 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -16,7 +16,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new TestIntfI(communicator), communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index 887cda951e5..b57f51f8280 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -16,7 +16,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new TestIntfI(communicator), communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/custom/TestAMDI.cpp b/cpp/test/Ice/custom/TestAMDI.cpp index d8624cf48ea..f3f733464a0 100644 --- a/cpp/test/Ice/custom/TestAMDI.cpp +++ b/cpp/test/Ice/custom/TestAMDI.cpp @@ -18,7 +18,7 @@ TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator) void TestIntfI::opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr& opDoubleArrayCB, const std::pair<const Ice::Double*, const Ice::Double*>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::DoubleSeq outSeq(inSeq.first, inSeq.second); opDoubleArrayCB->ice_response(outSeq, outSeq); @@ -27,7 +27,7 @@ TestIntfI::opDoubleArray_async(const Test::AMD_TestIntf_opDoubleArrayPtr& opDoub void TestIntfI::opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr& opBoolArrayCB, const std::pair<const bool*, const bool*>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::BoolSeq outSeq(inSeq.first, inSeq.second); opBoolArrayCB->ice_response(outSeq, outSeq); @@ -36,7 +36,7 @@ TestIntfI::opBoolArray_async(const Test::AMD_TestIntf_opBoolArrayPtr& opBoolArra void TestIntfI::opByteArray_async(const Test::AMD_TestIntf_opByteArrayPtr& opByteArrayCB, const std::pair<const Ice::Byte*, const Ice::Byte*>& inSeq, - const Ice::Current& current) + const Ice::Current&) { opByteArrayCB->ice_response(inSeq, inSeq); } @@ -44,7 +44,7 @@ TestIntfI::opByteArray_async(const Test::AMD_TestIntf_opByteArrayPtr& opByteArra void TestIntfI::opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr& opVariableArrayCB, const std::pair<const Test::Variable*, const Test::Variable*>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::VariableList outSeq(inSeq.first, inSeq.second); opVariableArrayCB->ice_response(outSeq, outSeq); @@ -53,7 +53,7 @@ TestIntfI::opVariableArray_async(const Test::AMD_TestIntf_opVariableArrayPtr& op void TestIntfI::opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr& opBoolRangeCB, const std::pair<Test::BoolSeq::const_iterator, Test::BoolSeq::const_iterator>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::BoolSeq outSeq(inSeq.first, inSeq.second); opBoolRangeCB->ice_response(outSeq, outSeq); @@ -62,7 +62,7 @@ TestIntfI::opBoolRange_async(const Test::AMD_TestIntf_opBoolRangePtr& opBoolRang void TestIntfI::opByteRange_async(const Test::AMD_TestIntf_opByteRangePtr& opByteRangeCB, const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - const Ice::Current& current) + const Ice::Current&) { opByteRangeCB->ice_response(inSeq, inSeq); } @@ -71,7 +71,7 @@ void TestIntfI::opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr& opVariableRangeCB, const std::pair<Test::VariableList::const_iterator, Test::VariableList::const_iterator>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::VariableList outSeq(inSeq.first, inSeq.second); opVariableRangeCB->ice_response(outSeq, outSeq); @@ -80,7 +80,7 @@ TestIntfI::opVariableRange_async(const Test::AMD_TestIntf_opVariableRangePtr& op void TestIntfI::opBoolRangeType_async(const Test::AMD_TestIntf_opBoolRangeTypePtr& opBoolRangeTypeCB, const std::pair<const bool*, const bool*>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::BoolSeq outSeq(inSeq.first, inSeq.second); opBoolRangeTypeCB->ice_response(outSeq, outSeq); @@ -89,7 +89,7 @@ TestIntfI::opBoolRangeType_async(const Test::AMD_TestIntf_opBoolRangeTypePtr& op void TestIntfI::opByteRangeType_async(const Test::AMD_TestIntf_opByteRangeTypePtr& opByteRangeTypeCB, const std::pair<Test::ByteList::const_iterator, Test::ByteList::const_iterator>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::ByteList outSeq(inSeq.first, inSeq.second); opByteRangeTypeCB->ice_response(outSeq, outSeq); @@ -99,7 +99,7 @@ void TestIntfI::opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTypePtr& opVariableRangeTypeCB, const std::pair<std::deque<Test::Variable>::const_iterator, std::deque<Test::Variable>::const_iterator>& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::VariableList outSeq; for(std::deque<Test::Variable>::const_iterator p = inSeq.first; p != inSeq.second; ++p) @@ -112,7 +112,7 @@ TestIntfI::opVariableRangeType_async(const Test::AMD_TestIntf_opVariableRangeTyp void TestIntfI::opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr& opBoolSeqCB, const std::deque<bool>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<bool> outSeq(inSeq); opBoolSeqCB->ice_response(outSeq, outSeq); @@ -121,7 +121,7 @@ TestIntfI::opBoolSeq_async(const Test::AMD_TestIntf_opBoolSeqPtr& opBoolSeqCB, void TestIntfI::opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr& opBoolListCB, const Test::BoolList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::BoolList outSeq(inSeq); opBoolListCB->ice_response(outSeq, outSeq); @@ -130,7 +130,7 @@ TestIntfI::opBoolList_async(const Test::AMD_TestIntf_opBoolListPtr& opBoolListCB void TestIntfI::opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr& opByteSeqCB, const std::deque<Ice::Byte>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Ice::Byte> outSeq(inSeq); opByteSeqCB->ice_response(outSeq, outSeq); @@ -139,7 +139,7 @@ TestIntfI::opByteSeq_async(const Test::AMD_TestIntf_opByteSeqPtr& opByteSeqCB, void TestIntfI::opByteList_async(const Test::AMD_TestIntf_opByteListPtr& opByteListCB, const Test::ByteList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::ByteList outSeq(inSeq); opByteListCB->ice_response(outSeq, outSeq); @@ -148,7 +148,7 @@ TestIntfI::opByteList_async(const Test::AMD_TestIntf_opByteListPtr& opByteListCB void TestIntfI::opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr& opMyByteSeqCB, const MyByteSeq& inSeq, - const Ice::Current& current) + const Ice::Current&) { MyByteSeq outSeq(inSeq); opMyByteSeqCB->ice_response(outSeq, outSeq); @@ -157,7 +157,7 @@ TestIntfI::opMyByteSeq_async(const Test::AMD_TestIntf_opMyByteSeqPtr& opMyByteSe void TestIntfI::opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr& opStringSeqCB, const std::deque<std::string>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<std::string> outSeq(inSeq); opStringSeqCB->ice_response(outSeq, outSeq); @@ -166,7 +166,7 @@ TestIntfI::opStringSeq_async(const Test::AMD_TestIntf_opStringSeqPtr& opStringSe void TestIntfI::opStringList_async(const Test::AMD_TestIntf_opStringListPtr& opStringListCB, const Test::StringList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::StringList outSeq(inSeq); opStringListCB->ice_response(outSeq, outSeq); @@ -175,7 +175,7 @@ TestIntfI::opStringList_async(const Test::AMD_TestIntf_opStringListPtr& opString void TestIntfI::opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr& opFixedSeqCB, const std::deque<Test::Fixed>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Test::Fixed> outSeq(inSeq); opFixedSeqCB->ice_response(outSeq, outSeq); @@ -184,7 +184,7 @@ TestIntfI::opFixedSeq_async(const Test::AMD_TestIntf_opFixedSeqPtr& opFixedSeqCB void TestIntfI::opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr& opFixedListCB, const Test::FixedList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::FixedList outSeq(inSeq); opFixedListCB->ice_response(outSeq, outSeq); @@ -193,7 +193,7 @@ TestIntfI::opFixedList_async(const Test::AMD_TestIntf_opFixedListPtr& opFixedLis void TestIntfI::opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr& opVariableSeqCB, const std::deque<Test::Variable>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Test::Variable> outSeq(inSeq); opVariableSeqCB->ice_response(outSeq, outSeq); @@ -202,7 +202,7 @@ TestIntfI::opVariableSeq_async(const Test::AMD_TestIntf_opVariableSeqPtr& opVari void TestIntfI::opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr& opVariableListCB, const Test::VariableList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::VariableList outSeq(inSeq); opVariableListCB->ice_response(outSeq, outSeq); @@ -211,7 +211,7 @@ TestIntfI::opVariableList_async(const Test::AMD_TestIntf_opVariableListPtr& opVa void TestIntfI::opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDictSeqPtr& opStringStringDictSeqCB, const std::deque<Test::StringStringDict>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Test::StringStringDict> outSeq(inSeq); opStringStringDictSeqCB->ice_response(outSeq, outSeq); @@ -220,7 +220,7 @@ TestIntfI::opStringStringDictSeq_async(const Test::AMD_TestIntf_opStringStringDi void TestIntfI::opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringDictListPtr& opStringStringDictListCB, const Test::StringStringDictList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::StringStringDictList outSeq(inSeq); opStringStringDictListCB->ice_response(outSeq, outSeq); @@ -229,7 +229,7 @@ TestIntfI::opStringStringDictList_async(const Test::AMD_TestIntf_opStringStringD void TestIntfI::opESeq_async(const Test::AMD_TestIntf_opESeqPtr& opESeqCB, const std::deque<Test::E>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Test::E> outSeq(inSeq); opESeqCB->ice_response(outSeq, outSeq); @@ -238,7 +238,7 @@ TestIntfI::opESeq_async(const Test::AMD_TestIntf_opESeqPtr& opESeqCB, void TestIntfI::opEList_async(const Test::AMD_TestIntf_opEListPtr& opEListCB, const Test::EList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::EList outSeq(inSeq); opEListCB->ice_response(outSeq, outSeq); @@ -247,7 +247,7 @@ TestIntfI::opEList_async(const Test::AMD_TestIntf_opEListPtr& opEListCB, void TestIntfI::opCPrxSeq_async(const Test::AMD_TestIntf_opCPrxSeqPtr& opCPrxSeqCB, const std::deque<Test::CPrx>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Test::CPrx> outSeq(inSeq); opCPrxSeqCB->ice_response(outSeq, outSeq); @@ -256,7 +256,7 @@ TestIntfI::opCPrxSeq_async(const Test::AMD_TestIntf_opCPrxSeqPtr& opCPrxSeqCB, void TestIntfI::opCPrxList_async(const Test::AMD_TestIntf_opCPrxListPtr& opCPrxListCB, const Test::CPrxList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::CPrxList outSeq(inSeq); opCPrxListCB->ice_response(outSeq, outSeq); @@ -265,7 +265,7 @@ TestIntfI::opCPrxList_async(const Test::AMD_TestIntf_opCPrxListPtr& opCPrxListCB void TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, const std::deque<Test::CPtr>& inSeq, - const Ice::Current& current) + const Ice::Current&) { std::deque<Test::CPtr> outSeq(inSeq); opCSeqCB->ice_response(outSeq, outSeq); @@ -274,7 +274,7 @@ TestIntfI::opCSeq_async(const Test::AMD_TestIntf_opCSeqPtr& opCSeqCB, void TestIntfI::opCList_async(const Test::AMD_TestIntf_opCListPtr& opCListCB, const Test::CList& inSeq, - const Ice::Current& current) + const Ice::Current&) { Test::CList outSeq(inSeq); opCListCB->ice_response(outSeq, outSeq); @@ -332,7 +332,7 @@ TestIntfI::opVarDict_async(const ::Test::AMD_TestIntf_opVarDictPtr& cb, void TestIntfI::shutdown_async(const Test::AMD_TestIntf_shutdownPtr& shutdownCB, - const Ice::Current& current) + const Ice::Current&) { _communicator->shutdown(); shutdownCB->ice_response(); diff --git a/cpp/test/Ice/custom/TestI.cpp b/cpp/test/Ice/custom/TestI.cpp index 2e148c6f2cd..80119801f24 100644 --- a/cpp/test/Ice/custom/TestI.cpp +++ b/cpp/test/Ice/custom/TestI.cpp @@ -18,7 +18,7 @@ TestIntfI::TestIntfI(const Ice::CommunicatorPtr& communicator) Test::DoubleSeq TestIntfI::opDoubleArray(const std::pair<const Ice::Double*, const Ice::Double*>& inSeq, Test::DoubleSeq& outSeq, - const Ice::Current& current) + const Ice::Current&) { Test::DoubleSeq(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -27,7 +27,7 @@ TestIntfI::opDoubleArray(const std::pair<const Ice::Double*, const Ice::Double*> Test::BoolSeq TestIntfI::opBoolArray(const std::pair<const bool*, const bool*>& inSeq, Test::BoolSeq& outSeq, - const Ice::Current& current) + const Ice::Current&) { Test::BoolSeq(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -36,7 +36,7 @@ TestIntfI::opBoolArray(const std::pair<const bool*, const bool*>& inSeq, Test::ByteList TestIntfI::opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>& inSeq, Test::ByteList& outSeq, - const Ice::Current& current) + const Ice::Current&) { Test::ByteList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -45,7 +45,7 @@ TestIntfI::opByteArray(const std::pair<const Ice::Byte*, const Ice::Byte*>& inSe Test::VariableList TestIntfI::opVariableArray(const std::pair<const Test::Variable*, const Test::Variable*>& inSeq, Test::VariableList& outSeq, - const Ice::Current& current) + const Ice::Current&) { Test::VariableList(inSeq.first, inSeq.second).swap(outSeq); return outSeq; @@ -113,7 +113,7 @@ TestIntfI::opVariableRangeType( std::deque<bool> TestIntfI::opBoolSeq(const std::deque<bool>& inSeq, std::deque<bool>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -122,7 +122,7 @@ TestIntfI::opBoolSeq(const std::deque<bool>& inSeq, std::list<bool> TestIntfI::opBoolList(const std::list<bool>& inSeq, std::list<bool>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -163,7 +163,7 @@ TestIntfI::opBoolDequeListRange(const ::std::pair< ::Test::BoolDequeList::const_ std::deque< ::Ice::Byte> TestIntfI::opByteSeq(const std::deque< ::Ice::Byte>& inSeq, std::deque< ::Ice::Byte>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -172,7 +172,7 @@ TestIntfI::opByteSeq(const std::deque< ::Ice::Byte>& inSeq, std::list< ::Ice::Byte> TestIntfI::opByteList(const std::list< ::Ice::Byte>& inSeq, std::list< ::Ice::Byte>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -181,7 +181,7 @@ TestIntfI::opByteList(const std::list< ::Ice::Byte>& inSeq, MyByteSeq TestIntfI::opMyByteSeq(const MyByteSeq& inSeq, MyByteSeq& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -190,7 +190,7 @@ TestIntfI::opMyByteSeq(const MyByteSeq& inSeq, std::deque< ::std::string> TestIntfI::opStringSeq(const std::deque< ::std::string>& inSeq, std::deque< ::std::string>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -199,7 +199,7 @@ TestIntfI::opStringSeq(const std::deque< ::std::string>& inSeq, std::list< ::std::string> TestIntfI::opStringList(const std::list< ::std::string>& inSeq, std::list< ::std::string>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -208,7 +208,7 @@ TestIntfI::opStringList(const std::list< ::std::string>& inSeq, std::deque< ::Test::Fixed> TestIntfI::opFixedSeq(const std::deque< ::Test::Fixed>& inSeq, std::deque< ::Test::Fixed>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -217,7 +217,7 @@ TestIntfI::opFixedSeq(const std::deque< ::Test::Fixed>& inSeq, std::list< ::Test::Fixed> TestIntfI::opFixedList(const std::list< ::Test::Fixed>& inSeq, std::list< ::Test::Fixed>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -226,7 +226,7 @@ TestIntfI::opFixedList(const std::list< ::Test::Fixed>& inSeq, std::deque< ::Test::Variable> TestIntfI::opVariableSeq(const std::deque< ::Test::Variable>& inSeq, std::deque< ::Test::Variable>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -235,7 +235,7 @@ TestIntfI::opVariableSeq(const std::deque< ::Test::Variable>& inSeq, std::list< ::Test::Variable> TestIntfI::opVariableList(const std::list< ::Test::Variable>& inSeq, std::list< ::Test::Variable>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -244,7 +244,7 @@ TestIntfI::opVariableList(const std::list< ::Test::Variable>& inSeq, std::deque< ::Test::StringStringDict> TestIntfI::opStringStringDictSeq(const std::deque< ::Test::StringStringDict>& inSeq, std::deque< ::Test::StringStringDict>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -253,7 +253,7 @@ TestIntfI::opStringStringDictSeq(const std::deque< ::Test::StringStringDict>& in std::list< ::Test::StringStringDict> TestIntfI::opStringStringDictList(const std::list< ::Test::StringStringDict>& inSeq, std::list< ::Test::StringStringDict>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -262,7 +262,7 @@ TestIntfI::opStringStringDictList(const std::list< ::Test::StringStringDict>& in std::deque< ::Test::E> TestIntfI::opESeq(const std::deque< ::Test::E>& inSeq, std::deque< ::Test::E>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -271,7 +271,7 @@ TestIntfI::opESeq(const std::deque< ::Test::E>& inSeq, std::list< ::Test::E> TestIntfI::opEList(const std::list< ::Test::E>& inSeq, std::list< ::Test::E>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -280,7 +280,7 @@ TestIntfI::opEList(const std::list< ::Test::E>& inSeq, std::deque< ::Test::CPrx> TestIntfI::opCPrxSeq(const std::deque< ::Test::CPrx>& inSeq, std::deque< ::Test::CPrx>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -289,7 +289,7 @@ TestIntfI::opCPrxSeq(const std::deque< ::Test::CPrx>& inSeq, std::list< ::Test::CPrx> TestIntfI::opCPrxList(const std::list< ::Test::CPrx>& inSeq, std::list< ::Test::CPrx>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -298,7 +298,7 @@ TestIntfI::opCPrxList(const std::list< ::Test::CPrx>& inSeq, std::deque< ::Test::CPtr> TestIntfI::opCSeq(const std::deque< ::Test::CPtr>& inSeq, std::deque< ::Test::CPtr>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -307,7 +307,7 @@ TestIntfI::opCSeq(const std::deque< ::Test::CPtr>& inSeq, std::list< ::Test::CPtr> TestIntfI::opCList(const std::list< ::Test::CPtr>& inSeq, std::list< ::Test::CPtr>& outSeq, - const Ice::Current& current) + const Ice::Current&) { outSeq = inSeq; return inSeq; @@ -359,7 +359,7 @@ TestIntfI::opVarDict(const Test::CustomMap<std::string, Ice::Int>& data, } void -TestIntfI::shutdown(const Ice::Current& current) +TestIntfI::shutdown(const Ice::Current&) { _communicator->shutdown(); } diff --git a/cpp/test/Ice/custom/WstringAMDI.cpp b/cpp/test/Ice/custom/WstringAMDI.cpp index c94f71faed2..c8c77ae8e19 100644 --- a/cpp/test/Ice/custom/WstringAMDI.cpp +++ b/cpp/test/Ice/custom/WstringAMDI.cpp @@ -12,7 +12,7 @@ void Test1::WstringClassI::opString_async(const ::Test1::AMD_WstringClass_opStringPtr& opStringCB, const ::std::wstring& s1, - const Ice::Current& current) + const Ice::Current&) { opStringCB->ice_response(s1, s1); } @@ -20,7 +20,7 @@ Test1::WstringClassI::opString_async(const ::Test1::AMD_WstringClass_opStringPtr void Test1::WstringClassI::opStruct_async(const ::Test1::AMD_WstringClass_opStructPtr& opStructCB, const ::Test1::WstringStruct& s1, - const Ice::Current& current) + const Ice::Current&) { opStructCB->ice_response(s1, s1); } @@ -28,7 +28,7 @@ Test1::WstringClassI::opStruct_async(const ::Test1::AMD_WstringClass_opStructPtr void Test1::WstringClassI::throwExcept_async(const ::Test1::AMD_WstringClass_throwExceptPtr& throwExceptCB, const ::std::wstring& reason, - const Ice::Current& current) + const Ice::Current&) { Test1::WstringException ex; ex.reason = reason; @@ -38,7 +38,7 @@ Test1::WstringClassI::throwExcept_async(const ::Test1::AMD_WstringClass_throwExc void Test2::WstringClassI::opString_async(const ::Test2::AMD_WstringClass_opStringPtr& opStringCB, const ::std::wstring& s1, - const Ice::Current& current) + const Ice::Current&) { opStringCB->ice_response(s1, s1); } @@ -46,7 +46,7 @@ Test2::WstringClassI::opString_async(const ::Test2::AMD_WstringClass_opStringPtr void Test2::WstringClassI::opStruct_async(const ::Test2::AMD_WstringClass_opStructPtr& opStructCB, const ::Test2::WstringStruct& s1, - const Ice::Current& current) + const Ice::Current&) { opStructCB->ice_response(s1, s1); } @@ -54,7 +54,7 @@ Test2::WstringClassI::opStruct_async(const ::Test2::AMD_WstringClass_opStructPtr void Test2::WstringClassI::throwExcept_async(const ::Test2::AMD_WstringClass_throwExceptPtr& throwExceptCB, const ::std::wstring& reason, - const Ice::Current& current) + const Ice::Current&) { Test2::WstringException ex; ex.reason = reason; diff --git a/cpp/test/Ice/custom/WstringI.cpp b/cpp/test/Ice/custom/WstringI.cpp index 9943ffda99d..bdc77125d4a 100644 --- a/cpp/test/Ice/custom/WstringI.cpp +++ b/cpp/test/Ice/custom/WstringI.cpp @@ -12,7 +12,7 @@ ::std::wstring Test1::WstringClassI::opString(const ::std::wstring& s1, ::std::wstring& s2, - const Ice::Current& current) + const Ice::Current&) { s2 = s1; return s1; @@ -21,7 +21,7 @@ Test1::WstringClassI::opString(const ::std::wstring& s1, ::Test1::WstringStruct Test1::WstringClassI::opStruct(const ::Test1::WstringStruct& s1, ::Test1::WstringStruct& s2, - const Ice::Current& current) + const Ice::Current&) { s2 = s1; return s1; @@ -29,7 +29,7 @@ Test1::WstringClassI::opStruct(const ::Test1::WstringStruct& s1, void Test1::WstringClassI::throwExcept(const ::std::wstring& reason, - const Ice::Current& current) + const Ice::Current&) { Test1::WstringException ex; ex.reason = reason; @@ -39,7 +39,7 @@ Test1::WstringClassI::throwExcept(const ::std::wstring& reason, ::std::wstring Test2::WstringClassI::opString(const ::std::wstring& s1, ::std::wstring& s2, - const Ice::Current& current) + const Ice::Current&) { s2 = s1; return s1; @@ -48,7 +48,7 @@ Test2::WstringClassI::opString(const ::std::wstring& s1, ::Test2::WstringStruct Test2::WstringClassI::opStruct(const ::Test2::WstringStruct& s1, ::Test2::WstringStruct& s2, - const Ice::Current& current) + const Ice::Current&) { s2 = s1; return s1; @@ -56,7 +56,7 @@ Test2::WstringClassI::opStruct(const ::Test2::WstringStruct& s1, void Test2::WstringClassI::throwExcept(const ::std::wstring& reason, - const Ice::Current& current) + const Ice::Current&) { Test2::WstringException ex; ex.reason = reason; diff --git a/cpp/test/Ice/defaultServant/Client.cpp b/cpp/test/Ice/defaultServant/Client.cpp index 0cae1b54f66..01dbfd268c2 100644 --- a/cpp/test/Ice/defaultServant/Client.cpp +++ b/cpp/test/Ice/defaultServant/Client.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/defaultValue/Client.cpp b/cpp/test/Ice/defaultValue/Client.cpp index bac2d8d5258..d7e03208f7b 100644 --- a/cpp/test/Ice/defaultValue/Client.cpp +++ b/cpp/test/Ice/defaultValue/Client.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[]) +run(int, char**) { void allTests(); allTests(); diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp index 8060023eeac..99287eee8ec 100644 --- a/cpp/test/Ice/dispatcher/Client.cpp +++ b/cpp/test/Ice/dispatcher/Client.cpp @@ -17,7 +17,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index 53e4ce4a359..f9f4c7bc67a 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/Server.cpp @@ -17,7 +17,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011"); diff --git a/cpp/test/Ice/dispatcher/TestI.cpp b/cpp/test/Ice/dispatcher/TestI.cpp index c0a562b9015..33730d317f2 100644 --- a/cpp/test/Ice/dispatcher/TestI.cpp +++ b/cpp/test/Ice/dispatcher/TestI.cpp @@ -15,13 +15,13 @@ using namespace std; void -TestIntfI::op(const Ice::Current& current) +TestIntfI::op(const Ice::Current&) { test(Dispatcher::isDispatcherThread()); } void -TestIntfI::opWithPayload(const Ice::ByteSeq&, const Ice::Current& current) +TestIntfI::opWithPayload(const Ice::ByteSeq&, const Ice::Current&) { test(Dispatcher::isDispatcherThread()); } diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp index 47700e7c981..1d9590ab37d 100644 --- a/cpp/test/Ice/enums/Client.cpp +++ b/cpp/test/Ice/enums/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { TestIntfPrx allTests(const Ice::CommunicatorPtr&); TestIntfPrx t = allTests(communicator); diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp index dccc85332e2..e9552295033 100644 --- a/cpp/test/Ice/enums/Server.cpp +++ b/cpp/test/Ice/enums/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp index 93f08ea904c..c6e9dda90db 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { ThrowerPrx allTests(const Ice::CommunicatorPtr&, bool); ThrowerPrx thrower = allTests(communicator, false); diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index 9218c15a392..5e5d163463d 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 4e70b5a51f3..90033feb1ee 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server"); using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 767c7ac0c83..3f230ff7cdb 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("serveramd"); using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index b701658ee80..2af3b254939 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -78,8 +78,8 @@ ThrowerI::throwAorDasAorD_async(const AMD_Thrower_throwAorDasAorDPtr& cb, } void -ThrowerI::throwBasA_async(const AMD_Thrower_throwBasAPtr& cb, - Ice::Int a, Ice::Int b, const Ice::Current& current) +ThrowerI::throwBasA_async(const AMD_Thrower_throwBasAPtr& /*cb*/, + Ice::Int a, Ice::Int b, const Ice::Current&) { B ex; ex.aMem = a; @@ -90,7 +90,7 @@ ThrowerI::throwBasA_async(const AMD_Thrower_throwBasAPtr& cb, void ThrowerI::throwCasA_async(const AMD_Thrower_throwCasAPtr& cb, - Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current& current) + Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) { C ex; ex.aMem = a; @@ -100,7 +100,7 @@ ThrowerI::throwCasA_async(const AMD_Thrower_throwCasAPtr& cb, } void -ThrowerI::throwBasB_async(const AMD_Thrower_throwBasBPtr& cb, +ThrowerI::throwBasB_async(const AMD_Thrower_throwBasBPtr& /*cb*/, Ice::Int a, Ice::Int b, const Ice::Current&) { B ex; @@ -112,7 +112,7 @@ ThrowerI::throwBasB_async(const AMD_Thrower_throwBasBPtr& cb, void ThrowerI::throwCasB_async(const AMD_Thrower_throwCasBPtr& cb, - Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current& current) + Ice::Int a, Ice::Int b, Ice::Int c, const Ice::Current&) { C ex; ex.aMem = a; @@ -133,7 +133,7 @@ ThrowerI::throwCasC_async(const AMD_Thrower_throwCasCPtr& cb, } void -ThrowerI::throwModA_async(const AMD_Thrower_throwModAPtr& cb, +ThrowerI::throwModA_async(const AMD_Thrower_throwModAPtr& /*cb*/, Ice::Int a, Ice::Int a2, const Ice::Current&) { Mod::A ex; @@ -153,14 +153,14 @@ ThrowerI::throwUndeclaredA_async(const AMD_Thrower_throwUndeclaredAPtr& cb, } void -ThrowerI::throwUndeclaredB_async(const AMD_Thrower_throwUndeclaredBPtr& cb, +ThrowerI::throwUndeclaredB_async(const AMD_Thrower_throwUndeclaredBPtr& /*cb*/, Ice::Int a, Ice::Int b, const Ice::Current&) { B ex; ex.aMem = a; ex.bMem = b; throw ex; -// cb->ice_exception(ex); + //cb->ice_exception(ex); } void diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp index 60ecbd0eeb1..90cd0519fd4 100644 --- a/cpp/test/Ice/facets/Client.cpp +++ b/cpp/test/Ice/facets/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { GPrx allTests(const Ice::CommunicatorPtr&); GPrx g = allTests(communicator); diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index e7cfd352c08..ce3722e3e83 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index e12f51ff762..d5432a34a0a 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp index f7b1c12df2d..e42695127df 100644 --- a/cpp/test/Ice/hold/Client.cpp +++ b/cpp/test/Ice/hold/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index 9de73fabed2..9198458d525 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { IceUtil::TimerPtr timer = new IceUtil::Timer(); diff --git a/cpp/test/Ice/info/Client.cpp b/cpp/test/Ice/info/Client.cpp index f8aa8a77a3a..b5dfab5b94d 100644 --- a/cpp/test/Ice/info/Client.cpp +++ b/cpp/test/Ice/info/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp index 07e6d2c2a39..376a89becdf 100644 --- a/cpp/test/Ice/info/Server.cpp +++ b/cpp/test/Ice/info/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server"); using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp index 065178b3289..02720a4982d 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { InitialPrx allTests(const Ice::CommunicatorPtr&); InitialPrx initial = allTests(communicator); diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index ab71ae7d1b1..caa9e16845e 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index a459a744e3e..1e7fbd168e7 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index 7d7d3612a43..cd45f924f44 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -114,7 +114,7 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) - pair<const Ice::Byte*, const Ice::Byte*> outPair(nullptr, nullptr); + pair<const Ice::Byte*, const Ice::Byte*> outPair(static_cast<const Ice::Byte*>(nullptr), static_cast<const Ice::Byte*>(nullptr)); #else pair<const Ice::Byte*, const Ice::Byte*> outPair(0, 0); #endif diff --git a/cpp/test/Ice/invoke/Client.cpp b/cpp/test/Ice/invoke/Client.cpp index c6e1d63da19..4fa81948f75 100644 --- a/cpp/test/Ice/invoke/Client.cpp +++ b/cpp/test/Ice/invoke/Client.cpp @@ -16,9 +16,9 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], +run(int, char**, const Ice::CommunicatorPtr& communicator, - const Ice::InitializationData& initData) + const Ice::InitializationData&) { Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); Test::MyClassPrx myClass = allTests(communicator); diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 53751798b20..aba7e5a1b0b 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -22,7 +22,7 @@ class HelloI : virtual public Hello public: virtual void - sayHello(const Ice::Current& foo) + sayHello(const Ice::Current&) { // Do nothing, this is just a dummy servant. } diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp index b3a385c8207..12463b9dd2a 100644 --- a/cpp/test/Ice/location/Client.cpp +++ b/cpp/test/Ice/location/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&, const string&); allTests(communicator, "ServerManager:default -p 12010"); diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index 61a8c38e680..8955e2495e1 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -17,7 +17,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, +run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) { // diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp index efb4e9b71b7..7c79ecd347b 100644 --- a/cpp/test/Ice/location/ServerLocator.cpp +++ b/cpp/test/Ice/location/ServerLocator.cpp @@ -104,7 +104,7 @@ ServerLocator::ServerLocator(const ServerLocatorRegistryPtr& registry, const ::I void ServerLocator::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& response, const Ice::Identity& id, - const Ice::Current& current) const + const Ice::Current&) const { ++const_cast<int&>(_requestCount); // We add a small delay to make sure locator request queuing gets tested when diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 4d2f3bb5aab..062c53fa565 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -24,7 +24,7 @@ ServerManagerI::ServerManagerI(const ServerLocatorRegistryPtr& registry, } void -ServerManagerI::startServer(const Ice::Current& current) +ServerManagerI::startServer(const Ice::Current&) { for(::std::vector<Ice::CommunicatorPtr>::const_iterator i = _communicators.begin(); i != _communicators.end(); ++i) { diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp index 3eff9f63e28..cdf7358005f 100644 --- a/cpp/test/Ice/metrics/AllTests.cpp +++ b/cpp/test/Ice/metrics/AllTests.cpp @@ -138,7 +138,7 @@ public: } void - updated(const Ice::PropertyDict& dict) + updated(const Ice::PropertyDict&) { Lock sync(*this); _updated = true; diff --git a/cpp/test/Ice/metrics/Client.cpp b/cpp/test/Ice/metrics/Client.cpp index 22af896c547..687ab80e361 100644 --- a/cpp/test/Ice/metrics/Client.cpp +++ b/cpp/test/Ice/metrics/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { MetricsPrx allTests(const Ice::CommunicatorPtr&); MetricsPrx metrics = allTests(communicator); diff --git a/cpp/test/Ice/metrics/Server.cpp b/cpp/test/Ice/metrics/Server.cpp index f0a1105483b..5829ccb6c0a 100644 --- a/cpp/test/Ice/metrics/Server.cpp +++ b/cpp/test/Ice/metrics/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/metrics/ServerAMD.cpp b/cpp/test/Ice/metrics/ServerAMD.cpp index c6a9c66be6a..26852a29ed0 100644 --- a/cpp/test/Ice/metrics/ServerAMD.cpp +++ b/cpp/test/Ice/metrics/ServerAMD.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("serveramd") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/metrics/TestAMDI.cpp b/cpp/test/Ice/metrics/TestAMDI.cpp index f75b9769dae..3fbb624f86a 100644 --- a/cpp/test/Ice/metrics/TestAMDI.cpp +++ b/cpp/test/Ice/metrics/TestAMDI.cpp @@ -43,13 +43,13 @@ MetricsI::opWithLocalException_async(const Test::AMD_Metrics_opWithLocalExceptio } void -MetricsI::opWithUnknownException_async(const Test::AMD_Metrics_opWithUnknownExceptionPtr& cb, const Ice::Current&) +MetricsI::opWithUnknownException_async(const Test::AMD_Metrics_opWithUnknownExceptionPtr&, const Ice::Current&) { throw "Test"; } void -MetricsI::opByteS_async(const Test::AMD_Metrics_opByteSPtr& cb, const Test::ByteSeq& bs, const Ice::Current&) +MetricsI::opByteS_async(const Test::AMD_Metrics_opByteSPtr& cb, const Test::ByteSeq&, const Ice::Current&) { cb->ice_response(); } diff --git a/cpp/test/Ice/metrics/TestI.cpp b/cpp/test/Ice/metrics/TestI.cpp index 52384c3736c..420cebf7a11 100644 --- a/cpp/test/Ice/metrics/TestI.cpp +++ b/cpp/test/Ice/metrics/TestI.cpp @@ -46,7 +46,7 @@ MetricsI::opWithUnknownException(const Ice::Current&) } void -MetricsI::opByteS(const Test::ByteSeq& bs, const Ice::Current&) +MetricsI::opByteS(const Test::ByteSeq&, const Ice::Current&) { } diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 0e8aef5be86..54efd5c1bbf 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -66,7 +66,7 @@ public: }; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::ObjectFactoryPtr factory = new MyObjectFactory; communicator->addObjectFactory(factory, "::Test::B"); diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 360b9dfc7e0..0cdbab7e03b 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 2935a81423a..cbdc407c524 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -46,7 +46,7 @@ public: }; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::ObjectFactoryPtr factory = new MyObjectFactory; communicator->addObjectFactory(factory, "::Test::I"); diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp index d351b19b76a..d079e5d7dfc 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) +run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&) { Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool); Test::MyClassPrx myClass = allTests(communicator, false); diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 4657db9072a..7ca9259b9ca 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -16,8 +16,8 @@ DEFINE_TEST("collocated") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, - const Ice::InitializationData& initData) +run(int, char**, const Ice::CommunicatorPtr& communicator, + const Ice::InitializationData&) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/operations/Oneways.cpp b/cpp/test/Ice/operations/Oneways.cpp index 8ad25599a17..3ada281344b 100644 --- a/cpp/test/Ice/operations/Oneways.cpp +++ b/cpp/test/Ice/operations/Oneways.cpp @@ -14,7 +14,7 @@ using namespace std; void -oneways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& proxy) +oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway()); diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp index 8775e36ebf8..ba80a6e250c 100644 --- a/cpp/test/Ice/operations/OnewaysAMI.cpp +++ b/cpp/test/Ice/operations/OnewaysAMI.cpp @@ -128,7 +128,7 @@ class AMI_MyClass_onewayOpByteExI : public Test::AMI_MyClass_opByte, public Call { public: - virtual void ice_response(::Ice::Byte r, ::Ice::Byte b) + virtual void ice_response(::Ice::Byte, ::Ice::Byte) { test(false); } @@ -145,7 +145,7 @@ typedef IceUtil::Handle<AMI_MyClass_onewayOpByteExI> AMI_MyClass_onewayOpByteExI } void -onewaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& proxy) +onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway()); diff --git a/cpp/test/Ice/operations/OnewaysNewAMI.cpp b/cpp/test/Ice/operations/OnewaysNewAMI.cpp index e82afcab5f9..d318e99497d 100644 --- a/cpp/test/Ice/operations/OnewaysNewAMI.cpp +++ b/cpp/test/Ice/operations/OnewaysNewAMI.cpp @@ -80,7 +80,7 @@ typedef IceUtil::Handle<Callback> CallbackPtr; } void -onewaysNewAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& proxy) +onewaysNewAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway()); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 243c4ffa3b5..ac097d3b036 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index 768fec900c1..37b739c68c4 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("serveramd") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index a51f098457a..4e5b90f2609 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -77,7 +77,7 @@ MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const I } void -MyDerivedClassI::delay_async(const Test::AMD_MyClass_delayPtr& cb, Ice::Int ms, const Ice::Current& current) +MyDerivedClassI::delay_async(const Test::AMD_MyClass_delayPtr& cb, Ice::Int ms, const Ice::Current&) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(ms)); cb->ice_response(); @@ -428,7 +428,7 @@ MyDerivedClassI::opIntS_async(const Test::AMD_MyClass_opIntSPtr& cb, const Test: } void -MyDerivedClassI::opByteSOneway_async(const Test::AMD_MyClass_opByteSOnewayPtr& cb, const Test::ByteS& s, +MyDerivedClassI::opByteSOneway_async(const Test::AMD_MyClass_opByteSOnewayPtr& cb, const Test::ByteS&, const Ice::Current&) { cb->ice_response(); diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index dd8b755edf3..0d0966c3254 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -49,7 +49,7 @@ MyDerivedClassI::shutdown(const Ice::Current& current) } void -MyDerivedClassI::delay(Ice::Int ms, const Ice::Current& current) +MyDerivedClassI::delay(Ice::Int ms, const Ice::Current&) { IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(ms)); } diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 525da24d6b7..99bd787eb8d 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -120,7 +120,7 @@ class AMI_MyClass_opByteExI : public Test::AMI_MyClass_opByte, public CallbackBa { public: - virtual void ice_response(::Ice::Byte r, ::Ice::Byte b) + virtual void ice_response(::Ice::Byte, ::Ice::Byte) { test(false); } @@ -503,7 +503,7 @@ class AMI_MyClass_opBoolSSI : public Test::AMI_MyClass_opBoolSS, public Callback { public: - virtual void ice_response(const ::Test::BoolSS&, const ::Test::BoolSS& bso) + virtual void ice_response(const ::Test::BoolSS&, const ::Test::BoolSS&) { called(); } @@ -920,7 +920,7 @@ public: called(); } - virtual void ice_exception(const ::Ice::Exception& ex) + virtual void ice_exception(const ::Ice::Exception&) { test(false); } @@ -954,7 +954,7 @@ public: called(); } - virtual void ice_exception(const ::Ice::Exception& ex) + virtual void ice_exception(const ::Ice::Exception&) { test(false); } diff --git a/cpp/test/Ice/operations/TwowaysNewAMI.cpp b/cpp/test/Ice/operations/TwowaysNewAMI.cpp index 647cc58c032..97e7f2ef239 100644 --- a/cpp/test/Ice/operations/TwowaysNewAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysNewAMI.cpp @@ -501,7 +501,7 @@ public: called(); } - void exCB(const Ice::Exception& ex) + void exCB(const Ice::Exception&) { test(false); } diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index d0145d44212..57274a36c39 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -235,7 +235,7 @@ public: }; InitialPrx -allTests(const Ice::CommunicatorPtr& communicator, bool collocated) +allTests(const Ice::CommunicatorPtr& communicator, bool) { FactoryI* factory = new FactoryI(); Ice::ObjectFactoryPtr f(factory); diff --git a/cpp/test/Ice/optional/Client.cpp b/cpp/test/Ice/optional/Client.cpp index e3240a4509d..18cdf0f6228 100644 --- a/cpp/test/Ice/optional/Client.cpp +++ b/cpp/test/Ice/optional/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { InitialPrx allTests(const Ice::CommunicatorPtr&, bool); InitialPrx initial = allTests(communicator, false); diff --git a/cpp/test/Ice/optional/Server.cpp b/cpp/test/Ice/optional/Server.cpp index 9945edca281..ddb80222cee 100644 --- a/cpp/test/Ice/optional/Server.cpp +++ b/cpp/test/Ice/optional/Server.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index f26194e934a..fb318f5eb8d 100644 --- a/cpp/test/Ice/optional/TestI.cpp +++ b/cpp/test/Ice/optional/TestI.cpp @@ -340,7 +340,7 @@ InitialI::opStringIntDict(const Optional<StringIntDict>& p1, Optional<StringIntD } void -InitialI::opClassAndUnknownOptional(const APtr& a, const Ice::Current&) +InitialI::opClassAndUnknownOptional(const APtr&, const Ice::Current&) { } diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp index 1896366d79c..bdcaeefcf61 100644 --- a/cpp/test/Ice/proxy/Client.cpp +++ b/cpp/test/Ice/proxy/Client.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("client") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) +run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&) { Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); Test::MyClassPrx myClass = allTests(communicator); diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index fd559f8a3ad..d32d4e65b80 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -16,8 +16,8 @@ DEFINE_TEST("collocated") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, - const Ice::InitializationData& initData) +run(int, char**, const Ice::CommunicatorPtr& communicator, + const Ice::InitializationData&) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index ebd750ab3e7..6004424ed47 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index e76f015b27d..540b85c30b3 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("serveramd") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp index aad4b0f5e62..de83bc8f1b3 100644 --- a/cpp/test/Ice/proxy/TestI.cpp +++ b/cpp/test/Ice/proxy/TestI.cpp @@ -30,7 +30,7 @@ MyDerivedClassI::shutdown(const Ice::Current& c) } Ice::Context -MyDerivedClassI::getContext(const Ice::Current& c) +MyDerivedClassI::getContext(const Ice::Current&) { return _ctx; } diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp index 95925cb90e4..3ab5f29e017 100644 --- a/cpp/test/Ice/retry/Client.cpp +++ b/cpp/test/Ice/retry/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { RetryPrx allTests(const Ice::CommunicatorPtr&); RetryPrx retry = allTests(communicator); diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index fda5cd33cdd..9eb6c10c1c0 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/servantLocator/Client.cpp b/cpp/test/Ice/servantLocator/Client.cpp index d8e570a3b46..2b8e8064f7e 100644 --- a/cpp/test/Ice/servantLocator/Client.cpp +++ b/cpp/test/Ice/servantLocator/Client.cpp @@ -30,7 +30,7 @@ main(int argc, char* argv[]) } int -TestClient::run(int argc, char* argv[]) +TestClient::run(int, char**) { TestIntfPrx allTests(const CommunicatorPtr&, bool); TestIntfPrx obj = allTests(communicator(), false); diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index 4acf0c53a4f..ccb9750830f 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -84,7 +84,7 @@ main(int argc, char* argv[]) } int -TestServer::run(int argc, char* argv[]) +TestServer::run(int, char**) { communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp index 67f4f4716e8..edd0f714a1c 100644 --- a/cpp/test/Ice/servantLocator/ServantLocatorI.cpp +++ b/cpp/test/Ice/servantLocator/ServantLocatorI.cpp @@ -56,7 +56,7 @@ ServantLocatorI::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie } void -ServantLocatorI::finished(const Ice::Current& current, const Ice::ObjectPtr& servant, +ServantLocatorI::finished(const Ice::Current& current, const Ice::ObjectPtr&, const Ice::LocalObjectPtr& cookie) { test(!_deactivated); diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index b28e66f085b..8a5e74c34b6 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -83,7 +83,7 @@ main(int argc, char* argv[]) } int -TestServer::run(int argc, char* argv[]) +TestServer::run(int, char**) { communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index a164b6d7b81..94662109215 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -83,7 +83,7 @@ main(int argc, char* argv[]) } int -TestServer::run(int argc, char* argv[]) +TestServer::run(int, char**) { communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp index f3ad656e96e..454a8fce8ce 100644 --- a/cpp/test/Ice/slicing/exceptions/Client.cpp +++ b/cpp/test/Ice/slicing/exceptions/Client.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { TestIntfPrx allTests(const Ice::CommunicatorPtr&); TestIntfPrx Test = allTests(communicator); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 8692df789d9..948db511b96 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp index 1b221f3afc0..939755eb977 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index b4415e1a625..1fd447ea2d0 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -98,7 +98,7 @@ public: } void - response_SBSUnknownDerivedAsSBaseCompact(const SBasePtr& sb) + response_SBSUnknownDerivedAsSBaseCompact(const SBasePtr&) { test(false); } @@ -111,7 +111,7 @@ public: } void - response_SUnknownAsObject10(const Ice::ObjectPtr& o) + response_SUnknownAsObject10(const Ice::ObjectPtr&) { test(false); } @@ -132,7 +132,7 @@ public: } void - exception_SUnknownAsObject11(const Ice::Exception& exc) + exception_SUnknownAsObject11(const Ice::Exception&) { test(false); } @@ -243,14 +243,14 @@ public: } void - response_returnTest1(const BPtr& r, const BPtr& p1, const BPtr& p2) + response_returnTest1(const BPtr& r, const BPtr& p1, const BPtr&) { test(r == p1); called(); } void - response_returnTest2(const BPtr& r, const BPtr& p1, const BPtr& p2) + response_returnTest2(const BPtr& r, const BPtr& p1, const BPtr&) { test(r == p1); called(); diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp index 68fb1990887..08e4101f51a 100644 --- a/cpp/test/Ice/slicing/objects/Client.cpp +++ b/cpp/test/Ice/slicing/objects/Client.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { TestIntfPrx allTests(const Ice::CommunicatorPtr&); TestIntfPrx Test = allTests(communicator); diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index 8692df789d9..948db511b96 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index 1b221f3afc0..939755eb977 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp index 6c4582bf053..65d847d0fc5 100644 --- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp +++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp @@ -274,7 +274,7 @@ TestI::returnTest2_async(const AMD_TestIntf_returnTest2Ptr& cb, const ::Ice::Cur } void -TestI::returnTest3_async(const AMD_TestIntf_returnTest3Ptr& cb, const BPtr& p1, const BPtr& p2, const ::Ice::Current&) +TestI::returnTest3_async(const AMD_TestIntf_returnTest3Ptr& cb, const BPtr& p1, const BPtr&, const ::Ice::Current&) { cb->ice_response(p1); } diff --git a/cpp/test/Ice/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp index dc2e807eb41..93194f6e84d 100644 --- a/cpp/test/Ice/slicing/objects/TestI.cpp +++ b/cpp/test/Ice/slicing/objects/TestI.cpp @@ -248,7 +248,7 @@ TestI::returnTest2(BPtr& p1, BPtr& p2, const ::Ice::Current&) } BPtr -TestI::returnTest3(const BPtr& p1, const BPtr& p2, const ::Ice::Current&) +TestI::returnTest3(const BPtr& p1, const BPtr&, const ::Ice::Current&) { return p1; } diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp index 8d5b0d9c217..a0d9ccb3dc4 100644 --- a/cpp/test/Ice/stream/Client.cpp +++ b/cpp/test/Ice/stream/Client.cpp @@ -64,7 +64,11 @@ class TestObjectFactory : public Ice::ObjectFactory public: virtual Ice::ObjectPtr +#ifndef NDEBUG create(const string& type) +#else + create(const string&) +#endif { assert(type == Test::MyClass::ice_staticId()); return new TestObjectReader; @@ -133,7 +137,7 @@ class MyInterfaceFactory : public Ice::ObjectFactory public: virtual Ice::ObjectPtr - create(const string& type) + create(const string&) { return new Test::MyInterface; } @@ -145,7 +149,7 @@ public: }; int -run(int argc, char** argv, const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { MyClassFactoryWrapperPtr factoryWrapper = new MyClassFactoryWrapper; communicator->addObjectFactory(factoryWrapper, Test::MyClass::ice_staticId()); diff --git a/cpp/test/Ice/threadPoolPriority/Client.cpp b/cpp/test/Ice/threadPoolPriority/Client.cpp index 4b3ff197bcc..406c3e368ed 100644 --- a/cpp/test/Ice/threadPoolPriority/Client.cpp +++ b/cpp/test/Ice/threadPoolPriority/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Test::PriorityPrx allTests(const Ice::CommunicatorPtr&); Test::PriorityPrx priority = allTests(communicator); diff --git a/cpp/test/Ice/threadPoolPriority/Server.cpp b/cpp/test/Ice/threadPoolPriority/Server.cpp index 3c44de05c17..6eb39007bb0 100644 --- a/cpp/test/Ice/threadPoolPriority/Server.cpp +++ b/cpp/test/Ice/threadPoolPriority/Server.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); diff --git a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp index f4db06cef67..0a800994b0e 100644 --- a/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp +++ b/cpp/test/Ice/threadPoolPriority/ServerCustomThreadPool.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp index d7169a5d4ba..34b36f6d8b8 100644 --- a/cpp/test/Ice/timeout/Client.cpp +++ b/cpp/test/Ice/timeout/Client.cpp @@ -17,7 +17,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { TimeoutPrx allTests(const Ice::CommunicatorPtr&); TimeoutPrx timeout = allTests(communicator); diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index 0e39eb56699..144f5669591 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -16,7 +16,7 @@ DEFINE_TEST("server") using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/udp/TestI.cpp b/cpp/test/Ice/udp/TestI.cpp index 78d1a392c69..1b96770d281 100644 --- a/cpp/test/Ice/udp/TestI.cpp +++ b/cpp/test/Ice/udp/TestI.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace Ice; void -TestIntfI::ping(const Test::PingReplyPrx& reply, const Current& current) +TestIntfI::ping(const Test::PingReplyPrx& reply, const Current&) { try { @@ -28,7 +28,7 @@ TestIntfI::ping(const Test::PingReplyPrx& reply, const Current& current) } void -TestIntfI::sendByteSeq(const Test::ByteSeq&, const Test::PingReplyPrx& reply, const Current& current) +TestIntfI::sendByteSeq(const Test::ByteSeq&, const Test::PingReplyPrx& reply, const Current&) { try { diff --git a/cpp/test/IceBox/admin/Client.cpp b/cpp/test/IceBox/admin/Client.cpp index 6e9d9ba0689..bba1b1ad73c 100644 --- a/cpp/test/IceBox/admin/Client.cpp +++ b/cpp/test/IceBox/admin/Client.cpp @@ -16,7 +16,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& comm) +run(int, char**, const Ice::CommunicatorPtr& comm) { void allTests(const Ice::CommunicatorPtr&); allTests(comm); diff --git a/cpp/test/IceBox/admin/Service.cpp b/cpp/test/IceBox/admin/Service.cpp index 0393a10bb13..745753aef12 100644 --- a/cpp/test/IceBox/admin/Service.cpp +++ b/cpp/test/IceBox/admin/Service.cpp @@ -66,7 +66,7 @@ ServiceI::~ServiceI() } void -ServiceI::start(const string& name, const CommunicatorPtr& communicator, const StringSeq& args) +ServiceI::start(const string&, const CommunicatorPtr&, const StringSeq&) { } diff --git a/cpp/test/IceBox/admin/TestI.cpp b/cpp/test/IceBox/admin/TestI.cpp index 6771e70949f..e830959f41b 100644 --- a/cpp/test/IceBox/admin/TestI.cpp +++ b/cpp/test/IceBox/admin/TestI.cpp @@ -18,7 +18,7 @@ TestFacetI::TestFacetI() : } Ice::PropertyDict -TestFacetI::getChanges(const Ice::Current& current) +TestFacetI::getChanges(const Ice::Current&) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); diff --git a/cpp/test/IceBox/configuration/Client.cpp b/cpp/test/IceBox/configuration/Client.cpp index 325fd7fcacf..2466de2f61f 100644 --- a/cpp/test/IceBox/configuration/Client.cpp +++ b/cpp/test/IceBox/configuration/Client.cpp @@ -16,7 +16,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& comm) +run(int, char**, const Ice::CommunicatorPtr& comm) { void allTests(const Ice::CommunicatorPtr&); allTests(comm); diff --git a/cpp/test/IceBox/configuration/TestI.cpp b/cpp/test/IceBox/configuration/TestI.cpp index ea746758b5c..8beae9ff9f0 100644 --- a/cpp/test/IceBox/configuration/TestI.cpp +++ b/cpp/test/IceBox/configuration/TestI.cpp @@ -23,7 +23,7 @@ TestI::getProperty(const std::string& name, const Ice::Current& current) } Ice::StringSeq -TestI::getArgs(const Ice::Current& current) +TestI::getArgs(const Ice::Current&) { return _args; } diff --git a/cpp/test/IceGrid/activation/Client.cpp b/cpp/test/IceGrid/activation/Client.cpp index 46b44b32b3d..8d639418232 100644 --- a/cpp/test/IceGrid/activation/Client.cpp +++ b/cpp/test/IceGrid/activation/Client.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace Test; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/allocation/AllTests.cpp b/cpp/test/IceGrid/allocation/AllTests.cpp index 99f7dd1087a..7ff3ca06553 100644 --- a/cpp/test/IceGrid/allocation/AllTests.cpp +++ b/cpp/test/IceGrid/allocation/AllTests.cpp @@ -47,7 +47,7 @@ public: } void - waitResponse(const char* file, int line) + waitResponse(const char*, int) { Lock sync(*this); while(!_response && !_exception) diff --git a/cpp/test/IceGrid/allocation/Client.cpp b/cpp/test/IceGrid/allocation/Client.cpp index 588737bcb4e..005fe492f84 100644 --- a/cpp/test/IceGrid/allocation/Client.cpp +++ b/cpp/test/IceGrid/allocation/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp index 5076497d2ce..e3562829e97 100644 --- a/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp +++ b/cpp/test/IceGrid/allocation/PermissionsVerifier.cpp @@ -17,7 +17,7 @@ class PermissionsVerifierI : public Glacier2::PermissionsVerifier public: virtual bool - checkPermissions(const string& userId, const string& passwd, string&, const Ice::Current& c) const + checkPermissions(const string&, const string&, string&, const Ice::Current&) const { return true; } diff --git a/cpp/test/IceGrid/deployer/Service.cpp b/cpp/test/IceGrid/deployer/Service.cpp index 894beaed2bb..c86fd89d13f 100644 --- a/cpp/test/IceGrid/deployer/Service.cpp +++ b/cpp/test/IceGrid/deployer/Service.cpp @@ -54,7 +54,7 @@ ServiceI::~ServiceI() void ServiceI::start(const string& name, const CommunicatorPtr& communicator, - const StringSeq& args) + const StringSeq&) { Ice::PropertiesPtr properties = communicator->getProperties(); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); diff --git a/cpp/test/IceGrid/distribution/Client.cpp b/cpp/test/IceGrid/distribution/Client.cpp index 588737bcb4e..005fe492f84 100644 --- a/cpp/test/IceGrid/distribution/Client.cpp +++ b/cpp/test/IceGrid/distribution/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp index b339003bf8f..0d5ac7ff3cb 100644 --- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp @@ -129,7 +129,7 @@ hasProperty(const CommunicatorDescriptorPtr& desc, const string& name, const str } void -updateServerRuntimeProperties(const AdminPrx& admin, const string& server, const ServerDescriptorPtr& desc) +updateServerRuntimeProperties(const AdminPrx& admin, const string&, const ServerDescriptorPtr& desc) { ApplicationUpdateDescriptor update; update.name = "TestApp"; diff --git a/cpp/test/IceGrid/noRestartUpdate/Client.cpp b/cpp/test/IceGrid/noRestartUpdate/Client.cpp index 588737bcb4e..005fe492f84 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Client.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/noRestartUpdate/Service.cpp b/cpp/test/IceGrid/noRestartUpdate/Service.cpp index 48c54cf12e4..3590efa2e7f 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Service.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/Service.cpp @@ -54,7 +54,7 @@ ServiceI::~ServiceI() void ServiceI::start(const string& name, const CommunicatorPtr& communicator, - const StringSeq& args) + const StringSeq&) { Ice::PropertiesPtr properties = communicator->getProperties(); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); diff --git a/cpp/test/IceGrid/replicaGroup/Client.cpp b/cpp/test/IceGrid/replicaGroup/Client.cpp index 936ddf29102..eedc05812dd 100644 --- a/cpp/test/IceGrid/replicaGroup/Client.cpp +++ b/cpp/test/IceGrid/replicaGroup/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/replicaGroup/Server.cpp b/cpp/test/IceGrid/replicaGroup/Server.cpp index 49d3cda75c6..8d919ecd94d 100644 --- a/cpp/test/IceGrid/replicaGroup/Server.cpp +++ b/cpp/test/IceGrid/replicaGroup/Server.cpp @@ -21,7 +21,7 @@ public: }; int -Server::run(int argc, char* argv[]) +Server::run(int, char**) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("ReplicatedAdapter"); Ice::ObjectPtr object = new TestI(communicator()->getProperties()); diff --git a/cpp/test/IceGrid/replicaGroup/Service.cpp b/cpp/test/IceGrid/replicaGroup/Service.cpp index c49dab01bc7..9bbbc618039 100644 --- a/cpp/test/IceGrid/replicaGroup/Service.cpp +++ b/cpp/test/IceGrid/replicaGroup/Service.cpp @@ -53,7 +53,7 @@ ServiceI::~ServiceI() void ServiceI::start(const string& name, const CommunicatorPtr& communicator, - const StringSeq& args) + const StringSeq&) { Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter(name); Ice::ObjectPtr object = new TestI(communicator->getProperties()); diff --git a/cpp/test/IceGrid/replication/Client.cpp b/cpp/test/IceGrid/replication/Client.cpp index e9d1461487e..31006c59893 100644 --- a/cpp/test/IceGrid/replication/Client.cpp +++ b/cpp/test/IceGrid/replication/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/replication/Server.cpp b/cpp/test/IceGrid/replication/Server.cpp index 87698644af6..0fbae37e9c7 100644 --- a/cpp/test/IceGrid/replication/Server.cpp +++ b/cpp/test/IceGrid/replication/Server.cpp @@ -21,7 +21,7 @@ public: }; int -Server::run(int argc, char* argv[]) +Server::run(int, char**) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(); diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 66e1c1e70de..c18dea86d86 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -132,7 +132,7 @@ public: } void - waitForUpdate(const char* file, int line) + waitForUpdate(const char*, int line) { Lock sync(*this); @@ -362,7 +362,7 @@ public: } virtual void - nodeInit(const NodeDynamicInfoSeq& info, const Ice::Current& current) + nodeInit(const NodeDynamicInfoSeq& info, const Ice::Current&) { Lock sync(*this); for(NodeDynamicInfoSeq::const_iterator p = info.begin(); p != info.end(); ++p) @@ -373,7 +373,7 @@ public: } virtual void - nodeUp(const NodeDynamicInfo& info, const Ice::Current& current) + nodeUp(const NodeDynamicInfo& info, const Ice::Current&) { Lock sync(*this); this->nodes[info.info.name] = filter(info); @@ -381,7 +381,7 @@ public: } virtual void - nodeDown(const string& name, const Ice::Current& current) + nodeDown(const string& name, const Ice::Current&) { Lock sync(*this); this->nodes.erase(name); @@ -389,7 +389,7 @@ public: } virtual void - updateServer(const string& node, const ServerDynamicInfo& info, const Ice::Current& current) + updateServer(const string& node, const ServerDynamicInfo& info, const Ice::Current&) { if(info.id == "Glacier2" || info.id == "Glacier2Admin" || info.id == "PermissionsVerifierServer") { @@ -427,7 +427,7 @@ public: } virtual void - updateAdapter(const string& node, const AdapterDynamicInfo& info, const Ice::Current& current) + updateAdapter(const string& node, const AdapterDynamicInfo& info, const Ice::Current&) { if(info.id == "PermissionsVerifierServer.Server") { @@ -509,7 +509,7 @@ public: } virtual void - registryInit(const RegistryInfoSeq& info, const Ice::Current& current) + registryInit(const RegistryInfoSeq& info, const Ice::Current&) { Lock sync(*this); for(RegistryInfoSeq::const_iterator p = info.begin(); p != info.end(); ++p) @@ -520,7 +520,7 @@ public: } virtual void - registryUp(const RegistryInfo& info, const Ice::Current& current) + registryUp(const RegistryInfo& info, const Ice::Current&) { Lock sync(*this); this->registries[info.name] = info; @@ -528,7 +528,7 @@ public: } virtual void - registryDown(const string& name, const Ice::Current& current) + registryDown(const string& name, const Ice::Current&) { Lock sync(*this); this->registries.erase(name); diff --git a/cpp/test/IceGrid/session/Client.cpp b/cpp/test/IceGrid/session/Client.cpp index 8a11b109510..0444d2873e1 100644 --- a/cpp/test/IceGrid/session/Client.cpp +++ b/cpp/test/IceGrid/session/Client.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceGrid/session/Server.cpp b/cpp/test/IceGrid/session/Server.cpp index 9612ca67d65..1f60d7c9c77 100644 --- a/cpp/test/IceGrid/session/Server.cpp +++ b/cpp/test/IceGrid/session/Server.cpp @@ -62,7 +62,7 @@ public: }; int -Server::run(int argc, char* argv[]) +Server::run(int, char**) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Server"); if(communicator()->getProperties()->getPropertyAsInt("AddPermissionsVerifiers") > 0) diff --git a/cpp/test/IceGrid/update/Client.cpp b/cpp/test/IceGrid/update/Client.cpp index 588737bcb4e..005fe492f84 100644 --- a/cpp/test/IceGrid/update/Client.cpp +++ b/cpp/test/IceGrid/update/Client.cpp @@ -14,7 +14,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&); allTests(communicator); diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp index b437770ce58..d78f7f58ecb 100644 --- a/cpp/test/IceSSL/configuration/Server.cpp +++ b/cpp/test/IceSSL/configuration/Server.cpp @@ -13,7 +13,7 @@ using namespace std; int -run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) +run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "tcp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp index 1b69d855a9b..c2b1bf703b6 100644 --- a/cpp/test/IceSSL/configuration/TestI.cpp +++ b/cpp/test/IceSSL/configuration/TestI.cpp @@ -72,7 +72,7 @@ ServerI::destroy() } Test::ServerPrx -ServerFactoryI::createServer(const Test::Properties& props, const Current& current) +ServerFactoryI::createServer(const Test::Properties& props, const Current&) { InitializationData initData; initData.properties = createProperties(); diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp index 372df44a302..4b73dc99760 100644 --- a/cpp/test/IceStorm/federation/Publisher.cpp +++ b/cpp/test/IceStorm/federation/Publisher.cpp @@ -17,7 +17,7 @@ using namespace IceStorm; using namespace Test; int -run(int argc, char* argv[], const CommunicatorPtr& communicator) +run(int, char* argv[], const CommunicatorPtr& communicator) { PropertiesPtr properties = communicator->getProperties(); const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default"; diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp index 52b756895f9..402639b116f 100644 --- a/cpp/test/IceStorm/federation/Subscriber.cpp +++ b/cpp/test/IceStorm/federation/Subscriber.cpp @@ -30,7 +30,7 @@ public: } virtual void - pub(const string& data, const Ice::Current&) + pub(const string&, const Ice::Current&) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_countMutex); diff --git a/cpp/test/IceStorm/federation2/Subscriber.cpp b/cpp/test/IceStorm/federation2/Subscriber.cpp index 42250f50361..a4ac87dfb76 100644 --- a/cpp/test/IceStorm/federation2/Subscriber.cpp +++ b/cpp/test/IceStorm/federation2/Subscriber.cpp @@ -38,7 +38,7 @@ public: } virtual void - pub(const string& data, const Ice::Current&) + pub(const string&, const Ice::Current&) { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(_countMutex); diff --git a/cpp/test/IceStorm/rep1/Subscriber.cpp b/cpp/test/IceStorm/rep1/Subscriber.cpp index d244142af14..a45e499488e 100644 --- a/cpp/test/IceStorm/rep1/Subscriber.cpp +++ b/cpp/test/IceStorm/rep1/Subscriber.cpp @@ -34,7 +34,7 @@ public: } virtual void - event(int i, const Current& current) + event(int i, const Current&) { if(_name == "twoway ordered" && i != _last) { diff --git a/cpp/test/IceStorm/repgrid/Client.cpp b/cpp/test/IceStorm/repgrid/Client.cpp index bf7152f9c17..6af1b4d395a 100644 --- a/cpp/test/IceStorm/repgrid/Client.cpp +++ b/cpp/test/IceStorm/repgrid/Client.cpp @@ -58,7 +58,7 @@ private: typedef IceUtil::Handle<SingleI> SingleIPtr; int -run(int argc, char* argv[], const CommunicatorPtr& communicator) +run(int, char* argv[], const CommunicatorPtr& communicator) { ObjectPrx base = communicator->stringToProxy("Test.IceStorm/TopicManager"); IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base); diff --git a/cpp/test/IceStorm/repstress/Publisher.cpp b/cpp/test/IceStorm/repstress/Publisher.cpp index 76948483085..18c5d496383 100644 --- a/cpp/test/IceStorm/repstress/Publisher.cpp +++ b/cpp/test/IceStorm/repstress/Publisher.cpp @@ -81,7 +81,7 @@ private: typedef IceUtil::Handle<PublishThread> PublishThreadPtr; int -run(int argc, char* argv[], const CommunicatorPtr& communicator) +run(int, char* argv[], const CommunicatorPtr& communicator) { PropertiesPtr properties = communicator->getProperties(); const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default"; diff --git a/cpp/test/IceStorm/repstress/Subscriber.cpp b/cpp/test/IceStorm/repstress/Subscriber.cpp index f5bab0c9337..cdc0599a652 100644 --- a/cpp/test/IceStorm/repstress/Subscriber.cpp +++ b/cpp/test/IceStorm/repstress/Subscriber.cpp @@ -40,7 +40,7 @@ public: } virtual void - event(int, const Current& current) + event(int, const Current&) { Lock sync(*this); ++_nevents; @@ -60,7 +60,7 @@ private: typedef IceUtil::Handle<SingleI> SingleIPtr; int -run(int argc, char* argv[], const CommunicatorPtr& communicator) +run(int, char* argv[], const CommunicatorPtr& communicator) { PropertiesPtr properties = communicator->getProperties(); const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default"; diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp index a84a486a7e7..308ca74bd79 100644 --- a/cpp/test/IceStorm/single/Publisher.cpp +++ b/cpp/test/IceStorm/single/Publisher.cpp @@ -17,7 +17,7 @@ using namespace IceStorm; using namespace Test; int -run(int argc, char* argv[], const CommunicatorPtr& communicator) +run(int, char* argv[], const CommunicatorPtr& communicator) { PropertiesPtr properties = communicator->getProperties(); const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default"; diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp index 437d595082d..b87e2f0ab46 100644 --- a/cpp/test/IceStorm/single/Subscriber.cpp +++ b/cpp/test/IceStorm/single/Subscriber.cpp @@ -104,7 +104,7 @@ private: typedef IceUtil::Handle<SingleI> SingleIPtr; int -run(int argc, char* argv[], const CommunicatorPtr& communicator) +run(int, char* argv[], const CommunicatorPtr& communicator) { PropertiesPtr properties = communicator->getProperties(); const char* managerProxyProperty = "IceStormAdmin.TopicManager.Default"; diff --git a/cpp/test/IceUtil/fileLock/Client.cpp b/cpp/test/IceUtil/fileLock/Client.cpp index 2fa4ada0fad..caf30856758 100644 --- a/cpp/test/IceUtil/fileLock/Client.cpp +++ b/cpp/test/IceUtil/fileLock/Client.cpp @@ -15,7 +15,7 @@ using namespace IceUtil; using namespace std; int -main(int argc, char** argv) +main(int, char**) { { IceUtilInternal::FileLockPtr lock; diff --git a/cpp/test/IceUtil/fileLock/ClientFail.cpp b/cpp/test/IceUtil/fileLock/ClientFail.cpp index 718fd2bfb7d..f8edd5dc1d3 100644 --- a/cpp/test/IceUtil/fileLock/ClientFail.cpp +++ b/cpp/test/IceUtil/fileLock/ClientFail.cpp @@ -15,7 +15,7 @@ using namespace IceUtil; using namespace std; int -main(int argc, char** argv) +main(int, char**) { IceUtilInternal::FileLockPtr lock; try diff --git a/cpp/test/IceUtil/priority/Client.cpp b/cpp/test/IceUtil/priority/Client.cpp index 3f034d519c9..7ddd273f091 100644 --- a/cpp/test/IceUtil/priority/Client.cpp +++ b/cpp/test/IceUtil/priority/Client.cpp @@ -33,7 +33,7 @@ getDefaultMutexProtocol() #endif int -main(int argc, char** argv) +main(int, char**) { try { diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp index dbd16560474..0bff11b4ae6 100644 --- a/cpp/test/IceUtil/thread/Client.cpp +++ b/cpp/test/IceUtil/thread/Client.cpp @@ -17,7 +17,7 @@ using namespace std; int -main(int argc, char** argv) +main(int, char**) { try { diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index aececb4033c..8448e96204e 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -136,7 +136,7 @@ private: }; typedef IceUtil::Handle<DestroyTask> DestroyTaskPtr; -int main(int argc, char* argv[]) +int main(int, char**) { cout << "testing timer... " << flush; { diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index 3cea5b30913..147690f2823 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -25,7 +25,12 @@ public: class charI: public _cpp_and::_cpp_char { public: + +#ifndef NDEBUG virtual void _cpp_explicit(const ::Ice::Current& current) +#else + virtual void _cpp_explicit(const ::Ice::Current&) +#endif { assert(current.operation == "explicit"); } |