ChangeLogTag: Mon Mar 31 11:52:26 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

4 files changed, 83 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index df318a21ddd..b6d2ff85359 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 31 11:52:26 2003  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tao/IOP_Codec.pidl: Fixed some comments
+	* tao/IOP_CodecC.{h,cpp,i}: Regenerated the files since the one
+	  merged form the branch was apparently created from the IDL
+	  compiler when its internal state was busted.
+
 Mon Mar 31 10:01:13 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp (set_is_multiple):
diff --git a/TAO/tao/IOP_Codec.pidl b/TAO/tao/IOP_Codec.pidl
index 311a117d77d..69137188c74 100644
--- a/TAO/tao/IOP_Codec.pidl
+++ b/TAO/tao/IOP_Codec.pidl
@@ -16,14 +16,14 @@
  *        -Wb,export_include=TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
- *        IOP.pidl
+ *        IOP_Codec.pidl
  *
  * and then:
  *
- * cp orig/IOPC.{h,i,cpp} .
- * patch < diffs/IOP.diff
+ * cp orig/IOP_CodecC.{h,i,cpp} .
+ * patch < diffs/IOP_Codec.diff
  *
- * The code left in IOPC.{h,i,cpp} is ready for use.
+ * The code left in IOP_CodecC.{h,i,cpp} is ready for use.
  *
  */
 
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index 09a8d7d41cf..5537ac88c3c 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -32,7 +32,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "TAO_Export.h"
+
+#include "tao/TAO_Export.h"
 #include "tao/Any_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/IOP_CodecC.i b/TAO/tao/IOP_CodecC.i
index 498af73fde8..a4cd1d43d07 100644
--- a/TAO/tao/IOP_CodecC.i
+++ b/TAO/tao/IOP_CodecC.i
@@ -20,6 +20,54 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_ci.cpp:67
 
@@ -27,6 +75,7 @@
 #define _IOP_CODEC___CI_
 
 template<>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -37,6 +86,7 @@ TAO::Any_Impl_T<IOP::Codec>::to_object (
 }
 
 template<>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
 {
@@ -44,6 +94,7 @@ TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
 }
 
 template<>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
 {
@@ -215,6 +266,22 @@ IOP::Encoding_var::ptr (void) const
   return this->ptr_;
 }
 
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // be/be_visitor_interface/interface_ci.cpp:67
 
@@ -222,6 +289,7 @@ IOP::Encoding_var::ptr (void) const
 #define _IOP_CODECFACTORY___CI_
 
 template<>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::to_object (
     CORBA::Object_ptr &_tao_elem
@@ -232,6 +300,7 @@ TAO::Any_Impl_T<IOP::CodecFactory>::to_object (
 }
 
 template<>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
 {
@@ -239,6 +308,7 @@ TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
 }
 
 template<>
+ACE_INLINE
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
 {