diff options
author | Benoit Foucher <benoit@zeroc.com> | 2007-01-26 14:33:31 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2007-01-26 14:33:31 +0000 |
commit | 187995db16ed980070bda0097e46436ebee6ef99 (patch) | |
tree | 4a00a753dfd9248a2a6c28c41c384648ef6c9af3 /cpp/src/IceGrid/FileParserI.cpp | |
parent | Added properties override in service config files (diff) | |
download | ice-187995db16ed980070bda0097e46436ebee6ef99.tar.bz2 ice-187995db16ed980070bda0097e46436ebee6ef99.tar.xz ice-187995db16ed980070bda0097e46436ebee6ef99.zip |
Minor warning fixes
Diffstat (limited to 'cpp/src/IceGrid/FileParserI.cpp')
-rwxr-xr-x | cpp/src/IceGrid/FileParserI.cpp | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/cpp/src/IceGrid/FileParserI.cpp b/cpp/src/IceGrid/FileParserI.cpp index fa213765592..f2e33fbb69b 100755 --- a/cpp/src/IceGrid/FileParserI.cpp +++ b/cpp/src/IceGrid/FileParserI.cpp @@ -6,25 +6,26 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -
-#include <IceGrid/FileParserI.h>
-#include <IceGrid/DescriptorParser.h>
-#include <IceXML/Parser.h>
-#include <Ice/ObjectAdapter.h>
-
-using namespace std;
-using namespace IceGrid;
-
-ApplicationDescriptor
-FileParserI::parse(const string& file, const AdminPrx& admin, const Ice::Current& current)
-{
- try
- {
- return DescriptorParser::parseDescriptor(file, Ice::StringSeq(), map<string, string>(),
- current.adapter->getCommunicator(), admin);
- }
- catch(const IceXML::ParserException& e)
- {
- throw ParseException(e.reason());
- }
-}
+ +#include <IceGrid/FileParserI.h> +#include <IceGrid/DescriptorParser.h> +#include <IceXML/Parser.h> +#include <Ice/ObjectAdapter.h> + +using namespace std; +using namespace IceGrid; + +ApplicationDescriptor +FileParserI::parse(const string& file, const AdminPrx& admin, const Ice::Current& current) +{ + try + { + return DescriptorParser::parseDescriptor(file, Ice::StringSeq(), map<string, string>(), + current.adapter->getCommunicator(), admin); + } + catch(const IceXML::ParserException& e) + { + throw ParseException(e.reason()); + return ApplicationDescriptor(); + } +} |