summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-31 13:18:55 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-31 13:18:55 +0000
commit93b4b96bc0467872b15dc0723e985a8f78f33565 (patch)
tree1cdce939276e155b0b8269246f69cfaacd4d11a2
parent988fa6d952d21cb5a147e4d7930d8a3810f07bc2 (diff)
downloadATCD-93b4b96bc0467872b15dc0723e985a8f78f33565.tar.gz
ChangeLogTag: `head -1 ChangeLog`
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a5
-rw-r--r--TAO/tao/IFR_Client/IFR_BaseC.cpp15
2 files changed, 12 insertions, 8 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e3538dbe16a..4d971cc401c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,7 @@
+Sat Mar 31 07:16:30 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/tao/IFR_Client/IFR_BaseC.cpp: Fixed errors in MSVC.
+
Sat Mar 31 02:23:16 2001 Sharath Cholleti <sharath@cs.wustl.edu>
* orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -26,7 +30,6 @@ Sat Mar 31 02:23:16 2001 Sharath Cholleti <sharath@cs.wustl.edu>
Fixed fuzz warnings for ACE_TRY_ENV.
-=======
Sat Mar 31 02:06:09 2001 Christopher Kohlhoff <chris@kohlhoff.com>
* tao/Makefile.bor:
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 397a4945430..e2360012a8b 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -20,6 +20,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
#include "IFR_BaseC.h"
+#include "tao/corbafwd.h"
#if TAO_HAS_INTERCEPTORS == 1
#include "tao/RequestInfo_Util.h"
@@ -398,13 +399,13 @@ _TAO_IRObject_Remote_Proxy_Broker::select_proxy (
// default constructor
-CORBA::IRObject::CORBA_IRObject (int collocated)
+CORBA_IRObject::CORBA_IRObject (int collocated)
{
this->CORBA_IRObject_setup_collocation (collocated);
}
// destructor
-CORBA::IRObject::~CORBA_IRObject (void)
+CORBA_IRObject::~CORBA_IRObject (void)
{}
void
@@ -2305,13 +2306,13 @@ _TAO_Contained_Remote_Proxy_Broker::select_proxy (
// default constructor
-CORBA::Contained::CORBA_Contained (int collocated)
+CORBA_Contained::CORBA_Contained (int collocated)
{
this->CORBA_Contained_setup_collocation (collocated);
}
// destructor
-CORBA::Contained::~CORBA_Contained (void)
+CORBA_Contained::~CORBA_Contained (void)
{}
void
@@ -4703,17 +4704,17 @@ _TAO_Container_Remote_Proxy_Broker::select_proxy (
// default constructor
-CORBA::Container::CORBA_Container (int collocated)
+CORBA_Container::CORBA_Container (int collocated)
{
this->CORBA_Container_setup_collocation (collocated);
}
// destructor
-CORBA::Container::~CORBA_Container (void)
+CORBA_Container::~CORBA_Container (void)
{}
void
-CORBA::Container::CORBA_Container_setup_collocation (int collocated)
+CORBA_Container::CORBA_Container_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_Container_Proxy_Broker_ =