ChangeLogTag: Mon Sep 6 15:24:49 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 35 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index ca7b97a0120..619a9805a2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Mon Sep  6 15:24:49 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Alt_Mapping/server.cpp:
+        
+          Updated code related to ObjectId to reflect ORB changes.
+          
+        * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp:
+        
+          Restored code generation for CDR operators for typedef of
+          sequence that had been erroneously commented out.
+          
+        * tao/Object_KeyC.cpp:
+        * tao/Object_KeyC.h:
+        * tao/Object_Key.pidl:
+        
+          Redefined TAO::ObjectKey as a typedef of CORBA::OctetSeq,
+          instead of a typedef of sequence<octet>.
+
 Fri Sep  3 18:50:06 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/PortableServer/Root_POA.cpp:
diff --git a/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
index 062fbfdb05b..3f41ffcdc80 100644
--- a/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
+++ b/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
@@ -195,7 +195,7 @@ be_visitor_typedef_cdr_op_ch::visit_enum (be_enum *node)
 
 int
 be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node)
-{/*
+{
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -219,7 +219,7 @@ be_visitor_typedef_cdr_op_ch::visit_sequence (be_sequence *node)
                             -1);
         }
     }
-*/
+
   return 0;
 }
 
diff --git a/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
index dbf92ddb9ec..d5e57d187f8 100644
--- a/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
+++ b/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
@@ -163,7 +163,7 @@ be_visitor_typedef_cdr_op_cs::visit_array (be_array *node)
 int
 be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node)
 {
-/*
+
   be_type *bt = 0;
 
   if (this->ctx_->alias ()) // typedef of a typedef
@@ -188,7 +188,7 @@ be_visitor_typedef_cdr_op_cs::visit_sequence (be_sequence *node)
                             -1);
         }
     }
-*/
+
   return 0;
 }
 
diff --git a/tao/Object_Key.pidl b/tao/Object_Key.pidl
index 327cd2844c4..46f5aa85a6b 100644
--- a/tao/Object_Key.pidl
+++ b/tao/Object_Key.pidl
@@ -19,9 +19,11 @@
 #ifndef TAO_OBJECTKEY_PIDL
 #define TAO_OBJECTKEY_PIDL
 
+#include "tao/OctetSeq.pidl"
+
 module TAO
 {
-  typedef sequence<octet> ObjectKey;
+  typedef CORBA::OctetSeq ObjectKey;
 };
 
 #endif /* TAO_OBJECTKEY_PIDL */
diff --git a/tao/Object_KeyC.cpp b/tao/Object_KeyC.cpp
index a5ea39eaa11..41617ec9b09 100644
--- a/tao/Object_KeyC.cpp
+++ b/tao/Object_KeyC.cpp
@@ -32,8 +32,6 @@
 #include "Object_KeyC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
-#include "tao/Vector_CDR_T.h"
-#include "tao/Vector_Argument_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/Object_KeyC.h b/tao/Object_KeyC.h
index 1611b2a0c65..b300a3c140e 100644
--- a/tao/Object_KeyC.h
+++ b/tao/Object_KeyC.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // .\be\be_codegen.cpp:149
 
-#ifndef _TAO_PIDL_OBJECT_KEYC_NXW5RV_H_
-#define _TAO_PIDL_OBJECT_KEYC_NXW5RV_H_
+#ifndef _TAO_PIDL_OBJECT_KEYC_EXVGOK_H_
+#define _TAO_PIDL_OBJECT_KEYC_EXVGOK_H_
 
 #include /**/ "ace/pre.h"
 
@@ -49,10 +49,11 @@
 #include <vector>
 
 #include "tao/Basic_Types.h"
-#include "tao/Sequence_T.h"
 #include /**/ "tao/Versioned_Namespace.h"
 #include "ace/streams.h"
 
+#include "tao/OctetSeqC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -69,14 +70,9 @@ namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // e:\branches\alt_mapping_saic\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:100
-
-#if !defined (_TAO_OBJECTKEY_CH_)
-#define _TAO_OBJECTKEY_CH_
+  // w:\tao\tao_idl\be\be_visitor_typedef/typedef_ch.cpp:462
   
-  typedef std::vector< ::CORBA::Octet> ObjectKey;
-
-#endif /* end #if !defined */
+  typedef CORBA::OctetSeq ObjectKey;
 
 // TAO_IDL - Generated from
 // e:\branches\alt_mapping_saic\tao\tao_idl\be\be_visitor_module/module_ch.cpp:70
diff --git a/tests/Alt_Mapping/server.cpp b/tests/Alt_Mapping/server.cpp
index 8d86a2403bb..f020fc1f858 100644
--- a/tests/Alt_Mapping/server.cpp
+++ b/tests/Alt_Mapping/server.cpp
@@ -93,16 +93,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                      -1);
 
       // Register with GoodPOA with a specific name
-      PortableServer::ObjectId_var id =
+      PortableServer::ObjectId id =
         PortableServer::string_to_ObjectId ("alt_mapping");
-      oa_ptr->activate_object_with_id (id.in (),
-                                       svnt);
+      oa_ptr->activate_object_with_id (id, svnt);
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
 
-      temp = oa_ptr->id_to_reference (id.in ());
+      temp = oa_ptr->id_to_reference (id);
 
       CORBA::String_var str =
         orb_ptr->object_to_string (temp.in ());