Bug fixes

6 files changed, 16 insertions, 9 deletions

diff --git a/cpp/demo/Database/Oracle/proc/Client.cpp b/cpp/demo/Database/Oracle/proc/Client.cpp
index af09a5a8de0..72067ef783d 100644
--- a/cpp/demo/Database/Oracle/proc/Client.cpp
+++ b/cpp/demo/Database/Oracle/proc/Client.cpp
@@ -59,7 +59,7 @@ HRClient::HRClient() :
 	"dept <identity>: set department <identity> as the current department\n"
 	"emp <identity>: set employee <identity> as the current employee\n"
 	"exit: exit client\n"
-	"help: prints this list of commands\n"
+	"help: print this list of commands\n"
 	"root: go back to the root menu\n";
 
     _rootCommands =
@@ -114,7 +114,8 @@ HRClient::checkCin(const string& command) const
 void
 HRClient::invalidCommand(const string& command) const
 {
-    cout << "Invalid command '" << command << "'" << endl;
+    cout << "Invalid command '" << command << "'. "
+	"Type 'help' for help." << endl;
     cin.ignore(numeric_limits<streamsize>::max(), '\n');
 }
 
diff --git a/cpp/demo/Database/Oracle/proc/DeptI.h b/cpp/demo/Database/Oracle/proc/DeptI.h
index 57ab29e932b..05c887e3538 100644
--- a/cpp/demo/Database/Oracle/proc/DeptI.h
+++ b/cpp/demo/Database/Oracle/proc/DeptI.h
@@ -19,7 +19,7 @@ public:
 
     DeptI(const CurrentSqlContext&, const std::string&);
     
-    virtual void ice_ping(const Ice::Current&);
+    virtual void ice_ping(const Ice::Current&) const;
 
     virtual HR::EmpPrx createEmp(int, const HR::EmpDesc&, const Ice::Current&);
 
diff --git a/cpp/demo/Database/Oracle/proc/DeptI.pc b/cpp/demo/Database/Oracle/proc/DeptI.pc
index 87040476194..3dea78a3cac 100644
--- a/cpp/demo/Database/Oracle/proc/DeptI.pc
+++ b/cpp/demo/Database/Oracle/proc/DeptI.pc
@@ -23,7 +23,7 @@ DeptI::DeptI(const CurrentSqlContext& currentCtx, const string& empCategory) :
 }
 
 void 
-DeptI::ice_ping(const Ice::Current& current)
+DeptI::ice_ping(const Ice::Current& current) const
 {
     struct sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
diff --git a/cpp/demo/Database/Oracle/proc/EmpI.h b/cpp/demo/Database/Oracle/proc/EmpI.h
index 3e0c7a36719..d9d5e2faca9 100644
--- a/cpp/demo/Database/Oracle/proc/EmpI.h
+++ b/cpp/demo/Database/Oracle/proc/EmpI.h
@@ -19,7 +19,7 @@ public:
 
     EmpI(const CurrentSqlContext&, const std::string&, const std::string&);
     
-    virtual void ice_ping(const Ice::Current&);
+    virtual void ice_ping(const Ice::Current&) const;
 
     virtual HR::EmpDesc getDesc(const Ice::Current&);    
     virtual void updateDesc(const HR::EmpDesc& newDesc, const Ice::Current&);
diff --git a/cpp/demo/Database/Oracle/proc/EmpI.pc b/cpp/demo/Database/Oracle/proc/EmpI.pc
index 6eb8c6b2c09..e6824eec158 100644
--- a/cpp/demo/Database/Oracle/proc/EmpI.pc
+++ b/cpp/demo/Database/Oracle/proc/EmpI.pc
@@ -24,7 +24,7 @@ EmpI::EmpI(const CurrentSqlContext& currentCtx,
 }
 
 void 
-EmpI::ice_ping(const Ice::Current& current)
+EmpI::ice_ping(const Ice::Current& current) const
 {
     struct sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
diff --git a/cpp/demo/Database/Oracle/proc/Makefile b/cpp/demo/Database/Oracle/proc/Makefile
index 57273815680..1e53760bfbd 100644
--- a/cpp/demo/Database/Oracle/proc/Makefile
+++ b/cpp/demo/Database/Oracle/proc/Makefile
@@ -41,15 +41,21 @@ CPPFLAGS	:= -I. -I$(ORACLE_HOME)/precomp/public -DSQLCA_NONE $(CPPFLAGS)
 
 GENERATED_PROC_FILES  = $(PROC_SRCS:.pc=.cpp) 
 
-ORACLE_LIBS     = -L$(ORACLE_HOME)/lib -lclntsh 
-
+ifeq ($(LP64),yes)
+   ORACLE_LIBS     = -L$(ORACLE_HOME)/lib -lclntsh 
+else
+   ORACLE_LIBS     = -L$(ORACLE_HOME)/lib32 -lclntsh
+endif
 
 .SUFFIXES:
 .SUFFIXES:		.pc .cpp .c .o
 
+#
+# The rm -f tp* $*.lis is to work around a proc bug on Linux
+#
 .pc.cpp:
 	proc threads=yes parse=none lines=yes code=cpp cpp_suffix=cpp close_on_commit=yes $<
-	rm tp* *.lis
+	rm -f tp* $*.lis
 
 $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@