ChangeLogTag: Mon Mar 29 18:46:20 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 53 insertions, 4 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index fe73cd35ec1..4948507ced1 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Mar 29 18:46:20 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Any.h:
+        * tao/AnyTypeCode/Any.cpp:
+        
+          Added non-copying Any insertion operator for std::string.
+          Not yet implemented, still a no-op.
+          
+        * tao/tao.mpc:
+        * tao/Vector_AnyOp_T.h:
+        
+          Moved this template file to the AnyTypeCode directory.
+
 Mon Mar 29 17:13:54 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Vector_CDR_T.h:
diff --git a/modules/TAO/tao/AnyTypeCode/Any.cpp b/modules/TAO/tao/AnyTypeCode/Any.cpp
index 661b42b7a9d..683ecc585ab 100644
--- a/modules/TAO/tao/AnyTypeCode/Any.cpp
+++ b/modules/TAO/tao/AnyTypeCode/Any.cpp
@@ -522,6 +522,12 @@ operator <<= (CORBA::Any &any, std::string & str)
   any <<= str.c_str ();
 }
 
+ACE_INLINE void
+operator <<= (CORBA::Any &any, std::string * str)
+{
+  // TODO
+}
+
 // Extraction: these are safe and hence we have to check that the
 // typecode of the Any is equal to the one we are trying to extract
 // into.
diff --git a/modules/TAO/tao/AnyTypeCode/Any.h b/modules/TAO/tao/AnyTypeCode/Any.h
index 2fd0723b25a..6f6dfe69e7e 100644
--- a/modules/TAO/tao/AnyTypeCode/Any.h
+++ b/modules/TAO/tao/AnyTypeCode/Any.h
@@ -302,6 +302,7 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr *);
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Object_ptr);
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Object_ptr *);
 TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const std::string &);
+TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, std::string *);
 
 /// Typesafe extraction.
 
diff --git a/modules/TAO/tao/Vector_AnyOp_T.h b/modules/TAO/tao/AnyTypeCode/Vector_AnyOp_T.h
index 4200d124dc6..ebda537860a 100644
--- a/modules/TAO/tao/Vector_AnyOp_T.h
+++ b/modules/TAO/tao/AnyTypeCode/Vector_AnyOp_T.h
@@ -16,11 +16,21 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
+  /// Copying
   template<typename T>
   void
   insert_value_vector (
     CORBA::Any &,
-    std::vector<T> &)
+    const std::vector<T> &)
+  {
+  }
+    
+  /// Non-copying  
+  template<typename T>
+  void
+  insert_value_vector (
+    CORBA::Any &,
+    std::vector<T> *)
   {
   }
     
@@ -33,11 +43,21 @@ namespace TAO
     return true;
   }  
 
+  /// Copying
   template<typename T>
   void
   insert_objref_vector (
     CORBA::Any &,
-    std::vector<T::_ptr_type> &)
+    const std::vector<T::_ptr_type> &)
+  {
+  }
+    
+  /// Non-copying
+  template<typename T>
+  void
+  insert_objref_vector (
+    CORBA::Any &,
+    std::vector<T::_ptr_type> *)
   {
   }
     
@@ -50,11 +70,21 @@ namespace TAO
     return true;
   }  
 
+  /// Copying
   template<typename T_forany>
   void
   insert_array_vector (
     CORBA::Any &,
-    std::vector<T_forany::_slice_type *> &)
+    const std::vector<T_forany::_slice_type *> &)
+  {
+  }
+    
+  /// Non-copying
+  template<typename T_forany>
+  void
+  insert_array_vector (
+    CORBA::Any &,
+    std::vector<T_forany::_slice_type *> *)
   {
   }
     
diff --git a/modules/TAO/tao/tao.mpc b/modules/TAO/tao/tao.mpc
index 5d3f97a41b7..76049060437 100644
--- a/modules/TAO/tao/tao.mpc
+++ b/modules/TAO/tao/tao.mpc
@@ -619,7 +619,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
     varbase.h
     VarOut_T.h
     Var_Size_Argument_T.h
-    Vector_AnyOp_T.h
     Vector_CDR_T.h
     Version.h
     Versioned_Namespace.h