summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-11 00:26:18 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-11 00:26:18 +0000
commitebd378c1e207fc5573835bdecaf2389af61619f9 (patch)
treec5b79bc306bd6f988063395405a4cffe62c57603
parent8674f00c4c65ed691b01787f62621539ca47f73e (diff)
downloadATCD-ebd378c1e207fc5573835bdecaf2389af61619f9.tar.gz
Added a no-op copy ctor to fool old g++.
-rw-r--r--TAO/examples/Simple/bank/AccountManager_i.cpp8
-rw-r--r--TAO/examples/Simple/bank/AccountManager_i.h3
-rw-r--r--TAO/examples/Simple/echo/Echo_i.cpp10
-rw-r--r--TAO/examples/Simple/echo/Echo_i.h3
4 files changed, 21 insertions, 3 deletions
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 5e9a2d38cc7..6de2d000699 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -12,6 +12,12 @@ AccountManager_i::AccountManager_i (void)
// no-op
}
+AccountManager_i::AccountManager_i (AccountManager_i &foo)
+ : POA_Bank::AccountManager (foo)
+{
+ // old g++ fooler.
+}
+
// Destructor
AccountManager_i::~AccountManager_i (void)
@@ -115,7 +121,7 @@ AccountManager_i::close (Bank::Account_ptr account,
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
"Unable to close Account\n");
}
ACE_ENDTRY;
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index b1cfb0d7fcf..bb40b237ab2 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -45,6 +45,9 @@ public:
AccountManager_i (void);
// Constructor.
+ AccountManager_i (AccountManager_i&);
+ // Copy constructor for old g++.
+
~AccountManager_i (void);
// Destructor.
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 50cbc84bdd0..4ccb450bbfe 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -10,6 +10,12 @@ Echo_i::Echo_i (void)
{
}
+// Old g++ fooler.
+Echo_i::Echo_i (Echo_i &foo)
+ : POA_Echo (foo)
+{
+}
+
// Destructor.
Echo_i::~Echo_i (void)
@@ -34,7 +40,7 @@ Echo_i::echo_list (const char *message,
ACE_UNUSED_ARG (message);
Echo::List *list;
-
+
ACE_NEW_RETURN (list,
Echo::List (3),
0);
@@ -78,7 +84,7 @@ Echo_i::echo_string (const char *mesg,
// Shutdown the server application.
-void
+void
Echo_i::shutdown (CORBA::Environment &)
ACE_THROW_SPEC ((CORBA::SystemException))
{
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 7e71d9277ee..9966f31f3f8 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -37,6 +37,9 @@ public:
Echo_i (void);
// Constructor.
+ Echo_i (Echo_i &);
+ // Copy constructor for old gcc.
+
~Echo_i (void);
// Destructor.