ChangeLogTag: Tue Jan 4 12:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 45 insertions, 31 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 285ba78604d..06f769e9962 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jan  4 12:09:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOPC.{h,cpp,i,inl}:
+          Regenerated and replaced .i with .inl file
+
+        * tao/IIOPA.cpp:
+          Regenerated
+
+        * tao/Makefile.am:
+          Updated because of change above
+
+        * tao/diffs/IIOP.diff
+          Removed this file, not needed anymore
+
 Tue Jan  4 12:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/IIOP_Transport.{h,cpp,i}:
diff --git a/TAO/tao/LongDoubleSeqS.h b/TAO/tao/LongDoubleSeqS.h
index 29768eca1fc..e032c4dcd9f 100644
--- a/TAO/tao/LongDoubleSeqS.h
+++ b/TAO/tao/LongDoubleSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_LONGDOUBLESEQS_H_
 #define _TAO_IDL_ORIG_LONGDOUBLESEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/LongLongSeqS.h b/TAO/tao/LongLongSeqS.h
index b8a5f3235e1..ae0dc2c662b 100644
--- a/TAO/tao/LongLongSeqS.h
+++ b/TAO/tao/LongLongSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_LONGLONGSEQS_H_
 #define _TAO_IDL_ORIG_LONGLONGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/LongSeqS.h b/TAO/tao/LongSeqS.h
index fba787dde8d..e4851fe42df 100644
--- a/TAO/tao/LongSeqS.h
+++ b/TAO/tao/LongSeqS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_LONGSEQS_H_
 #define _TAO_IDL_ORIG_LONGSEQS_H_
@@ -39,14 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,18 +50,22 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
+
 
 // TAO_IDL - Generated from
-// w:\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -76,3 +75,4 @@ namespace POA_CORBA
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 15d62a2c359..8b84f25b502 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -734,7 +734,7 @@ nobase_include_HEADERS += \
   GIOP_Message_State.inl \
   GIOP_Message_Version.inl \
   GIOP_Utils.i \
-  IIOPC.i \
+  IIOPC.inl \
   IIOP_Acceptor.i \
   IIOP_Connection_Handler.i \
   IIOP_Endpoint.i \