ChangeLogTag: Mon Mar 29 17:13:54 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 103 insertions, 7 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index b2be2e0aa20..fe73cd35ec1 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Mon Mar 29 17:13:54 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/Vector_CDR_T.h:
+        
+          Cosmetic changes.
+          
+        * tao/Vector_AnyOp_T.h:
+        
+          New file defining no-op Any insertion and extraction operators
+          for std::vector, in various categories of element types.
+          
+        * tao/tao.mpc:
+        
+          Added above files to the MPC project.
+
 Tue Mar  2 23:18:32 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tests/Param_Test/param_test_i.cpp:
diff --git a/modules/TAO/tao/Vector_AnyOp_T.h b/modules/TAO/tao/Vector_AnyOp_T.h
new file mode 100644
index 00000000000..4200d124dc6
--- /dev/null
+++ b/modules/TAO/tao/Vector_AnyOp_T.h
@@ -0,0 +1,73 @@
+#ifndef guard_vector_anyop
+#define guard_vector_anyop
+/**
+ * @file
+ *
+ * @brief CORBA::Any insertion/extraction for std::vector
+ *
+ * $Id$
+ *
+ * @author Jeff Parsons
+ */
+ 
+#include <vector>
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+namespace TAO
+{
+  template<typename T>
+  void
+  insert_value_vector (
+    CORBA::Any &,
+    std::vector<T> &)
+  {
+  }
+    
+  template<typename T>
+  bool
+  extract_value_vector (
+    const CORBA::Any &,
+    std::vector<T> &)
+  {
+    return true;
+  }  
+
+  template<typename T>
+  void
+  insert_objref_vector (
+    CORBA::Any &,
+    std::vector<T::_ptr_type> &)
+  {
+  }
+    
+  template<typename T>
+  bool
+  extract_objref_vector (
+    const CORBA::Any &,
+    std::vector<T::_ptr_type> &)
+  {
+    return true;
+  }  
+
+  template<typename T_forany>
+  void
+  insert_array_vector (
+    CORBA::Any &,
+    std::vector<T_forany::_slice_type *> &)
+  {
+  }
+    
+  template<typename T_forany>
+  bool
+  extract_array_vector (
+    const CORBA::Any &,
+    std::vector<T_forany::_slice_type *> &)
+  {
+    return true;
+  }  
+}
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif // guard_vector_anyop
diff --git a/modules/TAO/tao/Vector_CDR_T.h b/modules/TAO/tao/Vector_CDR_T.h
index 28a9ca98924..a5d2318c1ee 100644
--- a/modules/TAO/tao/Vector_CDR_T.h
+++ b/modules/TAO/tao/Vector_CDR_T.h
@@ -17,7 +17,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   template<typename T>
-  bool marshal_value_vector (
+  bool
+  marshal_value_vector (
     TAO_OutputCDR &strm,
     const std::vector<T> &source)
   {
@@ -42,7 +43,8 @@ namespace TAO
   }
 
   template<typename T>
-  bool demarshal_value_vector (
+  bool
+  demarshal_value_vector (
     TAO_InputCDR &strm,
     std::vector<T> &target)
   {
@@ -77,7 +79,8 @@ namespace TAO
   }
   
   template<typename T>
-  bool marshal_objref_vector (
+  bool
+  marshal_objref_vector (
     TAO_OutputCDR &strm,
     const std::vector<T::_ptr_type> &source)
   {
@@ -102,7 +105,8 @@ namespace TAO
   }
 
   template<typename T>
-  bool demarshal_objref_vector (
+  bool
+  demarshal_objref_vector (
     TAO_InputCDR &strm,
     std::vector<T::_ptr_type> &target)
   {
@@ -137,7 +141,8 @@ namespace TAO
   }
 
   template<typename T_forany>
-  bool marshal_array_vector (
+  bool
+  marshal_array_vector (
     TAO_OutputCDR &strm,
     const std::vector<T_forany::_slice_type *> &source)
   {
@@ -169,7 +174,8 @@ namespace TAO
   }
 
   template<typename T_forany>
-  bool demarshal_array_vector (
+  bool
+  demarshal_array_vector (
     TAO_InputCDR &strm,
     const std::vector<T_forany::_slice_type *> &source)
   {
@@ -214,4 +220,4 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#endif // guard_vector_cdr
\ No newline at end of file
+#endif // guard_vector_cdr
diff --git a/modules/TAO/tao/tao.mpc b/modules/TAO/tao/tao.mpc
index 3bb3ee07711..5d3f97a41b7 100644
--- a/modules/TAO/tao/tao.mpc
+++ b/modules/TAO/tao/tao.mpc
@@ -619,6 +619,8 @@ 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
     Wait_On_Leader_Follower.h