summaryrefslogtreecommitdiff
path: root/cpp/demo/Ice/hello/Server.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2002-04-24 21:13:00 +0000
committerMark Spruiell <mes@zeroc.com>2002-04-24 21:13:00 +0000
commit5409c1ecef0f226dedc77721c0d2fc8dfe9e85de (patch)
tree97ba75bc47a143726d6d8382be3a462e51716700 /cpp/demo/Ice/hello/Server.cpp
parentcleaning up sample impls (diff)
downloadice-5409c1ecef0f226dedc77721c0d2fc8dfe9e85de.tar.bz2
ice-5409c1ecef0f226dedc77721c0d2fc8dfe9e85de.tar.xz
ice-5409c1ecef0f226dedc77721c0d2fc8dfe9e85de.zip
merging from plugins branch
Diffstat (limited to 'cpp/demo/Ice/hello/Server.cpp')
-rw-r--r--cpp/demo/Ice/hello/Server.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index df1e6b22ba3..bf5a14b33f8 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -32,8 +32,9 @@ main(int argc, char* argv[])
try
{
- Ice::PropertiesPtr properties = Ice::createPropertiesFromFile(argc, argv, "config");
- communicator = Ice::initializeWithProperties(properties);
+ Ice::PropertiesPtr properties = Ice::createProperties(argc, argv);
+ properties->load("config");
+ communicator = Ice::initializeWithProperties(argc, argv, properties);
status = run(argc, argv, communicator);
}
catch(const Ice::Exception& ex)