ChangeLogTag:Mon Jan 10 09:45:14 2005 Nanbor Wang <nanbor@cs.wustl.edu>

3 files changed, 7 insertions, 15 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6f215d60d40..b70273c0d69 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan 10 09:45:14 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* DAnCE/RTNodeApplication/RTServer_Impl.h: 
+	* DAnCE/RTNodeApplication/RTServer_Impl.cpp: Removed init method
+	  altogether.  VC6 can't handle the syntax and we'll deal with
+	  later. 
+
 Fri Jan  7 10:02:02 2005  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* DAnCE/RTNodeApplication/RTServer_Impl.cpp (init): Changed to
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp
index e408e0b3958..597b8c76d6d 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.cpp
@@ -11,14 +11,3 @@ CIAO::RTServer::RTNodeApplication_Impl::~RTNodeApplication_Impl ()
 {
 }
 
-CORBA::Long
-CIAO::RTServer::RTNodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  // We will probably need two ORBs in this process.  One for the
-  // deployment framework, and one for the actual components.
-  return 0;
-}
-
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h b/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
index 003b3f29e50..75758c0dc36 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
@@ -63,10 +63,6 @@ namespace CIAO
       /// Destructor
       virtual ~RTNodeApplication_Impl (void);
 
-      /// Initialize the ComponentServer with a name.
-      CORBA::Long init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
     protected:
       RTCORBA::RTORB_var rtorb_;
     };