summaryrefslogtreecommitdiff
path: root/cpp/demo/Freeze/library/Parser.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2005-09-12 02:46:32 +0000
committerMatthew Newhook <matthew@zeroc.com>2005-09-12 02:46:32 +0000
commit759f7f34281a2c3d406ce93e52e63272a9d4beba (patch)
tree491339afc3ba74316d9d9019318836ffb6621ce8 /cpp/demo/Freeze/library/Parser.cpp
parentbug fix to the icepack hello demo. (diff)
downloadice-759f7f34281a2c3d406ce93e52e63272a9d4beba.tar.bz2
ice-759f7f34281a2c3d406ce93e52e63272a9d4beba.tar.xz
ice-759f7f34281a2c3d406ce93e52e63272a9d4beba.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=335
Diffstat (limited to 'cpp/demo/Freeze/library/Parser.cpp')
-rw-r--r--cpp/demo/Freeze/library/Parser.cpp26
1 files changed, 12 insertions, 14 deletions
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 4e83e00984a..43cc2e107bc 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -7,7 +7,6 @@
//
// **********************************************************************
-#include <Ice/Ice.h>
#include <Parser.h>
#ifdef HAVE_READLINE
@@ -16,7 +15,6 @@
#endif
using namespace std;
-using namespace Ice;
using namespace Demo;
extern FILE* yyin;
@@ -42,9 +40,9 @@ Parser::usage()
}
ParserPtr
-Parser::createParser(const CommunicatorPtr& communicator, const LibraryPrx& library)
+Parser::createParser(const LibraryPrx& library)
{
- return new Parser(communicator, library);
+ return new Parser(library);
}
void
@@ -78,7 +76,7 @@ Parser::addBook(const list<string>& _args)
{
error("the book already exists.");
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -116,7 +114,7 @@ Parser::findIsbn(const list<string>& args)
{
error(ex.message);
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -144,7 +142,7 @@ Parser::findAuthors(const list<string>& args)
{
error(ex.message);
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -197,7 +195,7 @@ Parser::printCurrent()
{
cout << "current book no longer exists" << endl;
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -238,7 +236,7 @@ Parser::rentCurrent(const list<string>& args)
{
error(ex.message);
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -273,7 +271,7 @@ Parser::returnCurrent()
{
error(ex.message);
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -304,7 +302,7 @@ Parser::removeCurrent()
{
error(ex.message);
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -329,7 +327,7 @@ Parser::setEvictorSize(const list<string>& args)
{
error(ex.message);
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -344,7 +342,7 @@ Parser::shutdown()
{
_library->shutdown();
}
- catch(const Exception& ex)
+ catch(const Ice::Exception& ex)
{
ostringstream s;
s << ex;
@@ -590,7 +588,7 @@ Parser::parse(const string& commands, bool debug)
return status;
}
-Parser::Parser(const CommunicatorPtr& communicator, const LibraryPrx& library) :
+Parser::Parser(const LibraryPrx& library) :
_library(library)
{
}