ChangeLogTag: Wed Aug 17 11:16:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 95 insertions, 41 deletions

diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
index cea0efcca00..78d76bfa6be 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
@@ -3,6 +3,8 @@
 #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
 #include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "tao/AnyTypeCode/WrongTransactionA.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (tao,
            TAO_AnyTypeCode_Adapter,
@@ -62,6 +64,84 @@ TAO_AnyTypeCode_Adapter_Impl::_tao_type_ ## name (void) const \
 STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Char const * mychar)
+{
+  (*any) <<= mychar;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar)
+{
+  (*any) <<= mywchar;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Long value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Short value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy)
+{
+  (*any) <<= policy;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy)
+{
+  (*any) <<= policy;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, CORBA::ULong value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_octet value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_string value)
+{
+  (*any) <<= value;
+}
+
+void
+TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wstring value)
+{
+  (*any) <<= value;
+}
+
 int
 TAO_AnyTypeCode_Adapter_Impl::Initializer (void)
 {
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
index 5a64d5da173..9cce2853ef0 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
@@ -84,57 +84,31 @@ public:
 ANYTYPECODE__EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::Char const * mychar)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Char const * mychar);
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar);
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::Long value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Long value);
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::Short value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Short value);
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy);
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy);
 
-  virtual void insert_into_any (CORBA::Any * any, CORBA::ULong value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, CORBA::ULong value);
 
-  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value);
 
-  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value);
 
-  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_octet value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_octet value);
 
-  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value);
 
-  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_string value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_string value);
 
-  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wstring value)
-  {
-  };
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wstring value);
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_AnyTypeCode_Adapter_Impl)
diff --git a/TAO/tao/ImR_Client/ImplRepoA.h b/TAO/tao/ImR_Client/ImplRepoA.h
index 947e76948ca..aaeab08b626 100644
--- a/TAO/tao/ImR_Client/ImplRepoA.h
+++ b/TAO/tao/ImR_Client/ImplRepoA.h
@@ -34,7 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "imr_client_export.h"
-#include "tao/ImplRepoC.h"
+#include "tao/ImR_Client/ImplRepoC.h"
 
 #if defined (__BORLANDC__)
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
diff --git a/TAO/tao/ImR_Client/ServerObjectA.h b/TAO/tao/ImR_Client/ServerObjectA.h
index d1b769adbe7..7dda3b08207 100644
--- a/TAO/tao/ImR_Client/ServerObjectA.h
+++ b/TAO/tao/ImR_Client/ServerObjectA.h
@@ -34,7 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "imr_client_export.h"
-#include "tao/ServerObjectC.h"
+#include "tao/ImR_Client/ServerObjectC.h"
 
 #if defined (__BORLANDC__)
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl