diff options
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/demo/Freeze/backup/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Glacier/session/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Glacier/session/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/hello/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/hello/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/latency/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/latency/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/throughput/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/throughput/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/value/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/Ice/value/Server.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/IceBox/hello/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/IcePack/hello/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/demo/IcePack/simple/Client.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Glacier/Blobject.cpp | 1 | ||||
-rw-r--r-- | cpp/src/Glacier2/Blobject.cpp | 1 |
16 files changed, 14 insertions, 16 deletions
diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp index 5baa5477ee1..2d173773f13 100644 --- a/cpp/demo/Freeze/backup/Client.cpp +++ b/cpp/demo/Freeze/backup/Client.cpp @@ -32,7 +32,7 @@ testFailed(const char* expr, const char* file, unsigned int line) int main(int argc, char* argv[]) { - PropertiesPtr properties = Ice::createProperties(argc, argv); + PropertiesPtr properties = Ice::createProperties(); properties->load("config"); CommunicatorPtr communicator = initializeWithProperties(argc, argv, properties); diff --git a/cpp/demo/Glacier/session/Client.cpp b/cpp/demo/Glacier/session/Client.cpp index 038d996acdc..c3be00765af 100644 --- a/cpp/demo/Glacier/session/Client.cpp +++ b/cpp/demo/Glacier/session/Client.cpp @@ -253,7 +253,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Glacier/session/Server.cpp b/cpp/demo/Glacier/session/Server.cpp index 186e196bd13..7d767890602 100644 --- a/cpp/demo/Glacier/session/Server.cpp +++ b/cpp/demo/Glacier/session/Server.cpp @@ -54,7 +54,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp index 21de2c01d58..18aab0bb1b9 100644 --- a/cpp/demo/Ice/hello/Client.cpp +++ b/cpp/demo/Ice/hello/Client.cpp @@ -183,7 +183,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp index 7eebbe57a63..fe0e9ec61f9 100644 --- a/cpp/demo/Ice/hello/Server.cpp +++ b/cpp/demo/Ice/hello/Server.cpp @@ -31,7 +31,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp index 39aaf20fef1..4cfbea32ef0 100644 --- a/cpp/demo/Ice/latency/Client.cpp +++ b/cpp/demo/Ice/latency/Client.cpp @@ -62,7 +62,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/latency/Server.cpp b/cpp/demo/Ice/latency/Server.cpp index 97222dae998..99de254a0f7 100644 --- a/cpp/demo/Ice/latency/Server.cpp +++ b/cpp/demo/Ice/latency/Server.cpp @@ -31,7 +31,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp index 90eb5db671b..5668c95db0c 100644 --- a/cpp/demo/Ice/throughput/Client.cpp +++ b/cpp/demo/Ice/throughput/Client.cpp @@ -169,7 +169,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/throughput/Server.cpp b/cpp/demo/Ice/throughput/Server.cpp index 76b9e958eb0..4dc49149c7f 100644 --- a/cpp/demo/Ice/throughput/Server.cpp +++ b/cpp/demo/Ice/throughput/Server.cpp @@ -30,7 +30,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp index 510a7303d99..a6adfe4b0dd 100644 --- a/cpp/demo/Ice/value/Client.cpp +++ b/cpp/demo/Ice/value/Client.cpp @@ -184,7 +184,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/Ice/value/Server.cpp b/cpp/demo/Ice/value/Server.cpp index 6a501da8f66..bef52641ad6 100644 --- a/cpp/demo/Ice/value/Server.cpp +++ b/cpp/demo/Ice/value/Server.cpp @@ -31,7 +31,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp index f560d46c13e..6cb32a985bb 100644 --- a/cpp/demo/IceBox/hello/Client.cpp +++ b/cpp/demo/IceBox/hello/Client.cpp @@ -178,7 +178,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/IcePack/hello/Client.cpp b/cpp/demo/IcePack/hello/Client.cpp index a6f2f528276..e787c5a9c9b 100644 --- a/cpp/demo/IcePack/hello/Client.cpp +++ b/cpp/demo/IcePack/hello/Client.cpp @@ -163,7 +163,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/demo/IcePack/simple/Client.cpp b/cpp/demo/IcePack/simple/Client.cpp index 4eebb81cc0d..1d63eb1785f 100644 --- a/cpp/demo/IcePack/simple/Client.cpp +++ b/cpp/demo/IcePack/simple/Client.cpp @@ -179,7 +179,7 @@ main(int argc, char* argv[]) try { - Ice::PropertiesPtr properties = Ice::createProperties(argc, argv); + Ice::PropertiesPtr properties = Ice::createProperties(); properties->load("config"); communicator = Ice::initializeWithProperties(argc, argv, properties); status = run(argc, argv, communicator); diff --git a/cpp/src/Glacier/Blobject.cpp b/cpp/src/Glacier/Blobject.cpp index b887d041e03..c2a2710ba9f 100644 --- a/cpp/src/Glacier/Blobject.cpp +++ b/cpp/src/Glacier/Blobject.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** -#include <Ice/RoutingTable.h> #include <Glacier/Blobject.h> using namespace std; diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp index 98e4e3c0967..3a860404755 100644 --- a/cpp/src/Glacier2/Blobject.cpp +++ b/cpp/src/Glacier2/Blobject.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** -#include <Ice/RoutingTable.h> #include <Glacier2/Blobject.h> using namespace std; |