ChangeLogTag: Sun Jul 27 19:11:41 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

14 files changed, 55 insertions, 97 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 41015dea657..ccac0a872a3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,29 @@
+Sun Jul 27 19:11:41 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
+
+          Fixed indentation in generation of pure virtual member accessor
+          method declarations.
+
+        * examples/Persistent_Grid/Grid_i.cpp:
+        * examples/Persistent_Grid/Grid_i.h:
+        * examples/Simple/bank/AccountManager_i.cpp:
+        * examples/Simple/bank/AccountManager_i.h:
+        * examples/Simple/echo/Echo_i.cpp:
+        * examples/Simple/echo/Echo_i.h:
+        * examples/Simple/grid/Grid_i.cpp:
+        * examples/Simple/grid/Grid_i.h:
+        * examples/Simple/time/Time_i.cpp:
+        * examples/Simple/time/Time_i.h:
+        * orbsvcs/tests/Trading/Offer_Importer.cpp:
+
+          Removed no-op copy constructors that were there only to placate
+          old g++.
+
+        * tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp:
+
+          Cast array subscript values of type char to int.
+
 Sun Jul 27 19:31:27 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
 	* examples/RTScheduling/DT_Creator.h: 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 39e59a59367..9531eee4eff 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -169,11 +169,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
         }
       else
         {
-          *os << " = 0;";
-
-          UTL_Scope *scope = node->defined_in ();
-          be_valuetype *vt = be_valuetype::narrow_from_scope (scope);
-          if (vt) *os << be_uidt;
+          *os << " = 0;" << be_uidt;
         }
       break;
     case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CS:
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 0502f60e8df..67dd2d72c8d 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -158,15 +158,6 @@ Grid_Factory_i::Grid_Factory_i (void)
   // no-op
 }
 
-// Copy Constructor
-
-Grid_Factory_i::Grid_Factory_i (Grid_Factory_i &grid)
-  : POA_Grid_Factory (grid),
-    pool_t_ (0)
-{
-  // no-op
-}
-
 // Destructor
 
 Grid_Factory_i::~Grid_Factory_i (void)
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index 50bf997a2c5..f7c281c25bc 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -34,13 +34,9 @@ public:
   Grid_Factory_i (void);
   // Constructor.
 
-  Grid_Factory_i (Grid_Factory_i &);
-  // Copy constructor to fool g++
-
   ~Grid_Factory_i (void);
   // Destructor.
 
-
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short
                               ACE_ENV_ARG_DECL)
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index d42cfd37b55..e4085e59f6c 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -13,12 +13,6 @@ AccountManager_i::AccountManager_i (void)
   // no-op
 }
 
-AccountManager_i::AccountManager_i (AccountManager_i &foo)
-  : POA_Bank::AccountManager (foo)
-{
-  // old g++ fooler.
-}
-
 // Destructor
 
 AccountManager_i::~AccountManager_i (void)
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index ba871e1a77f..3496e5a2050 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -47,9 +47,6 @@ public:
   AccountManager_i (void);
   // Constructor.
 
-  AccountManager_i (AccountManager_i&);
-  // Copy constructor for old g++.
-
   ~AccountManager_i (void);
   // Destructor.
 
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 2635c25d08c..4e0c5f95808 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -10,12 +10,6 @@ Echo_i::Echo_i (void)
 {
 }
 
-// Old g++ fooler.
-Echo_i::Echo_i (Echo_i &foo)
-  : POA_Echo (foo)
-{
-}
-
 // Destructor.
 
 Echo_i::~Echo_i (void)
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 333ec8ebdf7..1b782cce796 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -37,9 +37,6 @@ public:
   Echo_i (void);
   // Constructor.
 
-  Echo_i (Echo_i &);
-  // Copy constructor for old gcc.
-
   ~Echo_i (void);
   // Destructor.
 
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 75614a73df9..4d547003920 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -161,14 +161,6 @@ Grid_Factory_i::Grid_Factory_i (void)
   // no-op
 }
 
-// Copy Constructor
-
-Grid_Factory_i::Grid_Factory_i (Grid_Factory_i &grid)
-  :POA_Grid_Factory (grid)
-{
-  // no-op
-}
-
 // Destructor
 
 Grid_Factory_i::~Grid_Factory_i (void)
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index b0e59875924..77f08452574 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -100,9 +100,6 @@ public:
   Grid_Factory_i (void);
   // Constructor.
 
-  Grid_Factory_i (Grid_Factory_i &);
-  // Copy constructor to fool g++
-
   ~Grid_Factory_i (void);
   // Destructor.
 
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 758603bb25b..aeb172c1600 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -10,13 +10,6 @@ Time_i::Time_i (void)
   // no-op
 }
 
-// Copy  Constructor
-Time_i::Time_i (Time_i &t)
-  : POA_Time (t)
-{
-  // no-op
-}
-
 // Destructor
 
 Time_i::~Time_i (void)
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index 82514034cca..ae0ec382ff5 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -36,10 +36,6 @@ public:
   Time_i (void);
   // Constructor
 
-  Time_i (Time_i &);
-  // Copy Constructor added because g++ generates a
-  // bad one if not defined
-
   ~Time_i (void);
   // Destructor
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 8e367d0f0d8..5f17d483377 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -136,9 +136,10 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_Offer_Importer::
-perform_queries_with_policies (const TAO_Policy_Creator& policies
-                               ACE_ENV_ARG_DECL)
+TAO_Offer_Importer::perform_queries_with_policies (
+    const TAO_Policy_Creator& policies
+    ACE_ENV_ARG_DECL
+  )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -164,8 +165,7 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies
       };
 
       CosTrading::PropertyNameSeq prop_name_seq (4, 4, props, 0);
-      //desired_props.prop_names (prop_name_seq);
-      desired_props.all_ (1);
+      desired_props.prop_names (prop_name_seq);
 
       for (int i = 0; i < TT_Info::NUM_QUERIES; i++)
         {
diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
index f391d5ea626..764c1e03080 100644
--- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
+++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp
@@ -37,11 +37,11 @@ IBM1047_ISO8859::~IBM1047_ISO8859 (void)
 
 ACE_CDR::Boolean
 IBM1047_ISO8859::read_char (ACE_InputCDR &in,
-                                ACE_CDR::Char &x)
+                            ACE_CDR::Char &x)
 {
   if (this->read_1 (in, ACE_reinterpret_cast (ACE_CDR::Octet*, &x)))
     {
-      x = to_IBM1047[x];
+      x = to_IBM1047[(int) x];
       return 1;
     }
   return 0;
@@ -49,7 +49,7 @@ IBM1047_ISO8859::read_char (ACE_InputCDR &in,
 
 ACE_CDR::Boolean
 IBM1047_ISO8859::read_string (ACE_InputCDR& in,
-                                  ACE_CDR::Char *& x)
+                              ACE_CDR::Char *& x)
 {
   ACE_CDR::ULong len;
 
@@ -83,18 +83,11 @@ IBM1047_ISO8859::read_char_array (ACE_InputCDR& in,
                         ACE_CDR::OCTET_ALIGN,
                         len))
     {
-      for (ACE_CDR::ULong i = 0; i != len; ++i) {
-#if 0
-        ACE_DEBUG ((LM_DEBUG,"%x -> ",(unsigned char)x[i]));
-#endif
-        x[i] = (unsigned char)to_IBM1047[(unsigned char)x[i]];
-#if 0
-        if (i == len-1)
-          ACE_DEBUG ((LM_DEBUG,"%x\n",(unsigned char)x[i]));
-        else
-          ACE_DEBUG ((LM_DEBUG,"%x, ",(unsigned char)x[i]));
-#endif
-      }
+      for (ACE_CDR::ULong i = 0; i != len; ++i) 
+        {
+          x[i] = (unsigned char)to_IBM1047[(unsigned char)x[i]];
+        }
+
       return 1;
     }
 
@@ -103,45 +96,41 @@ IBM1047_ISO8859::read_char_array (ACE_InputCDR& in,
 
 ACE_CDR::Boolean
 IBM1047_ISO8859::write_char (ACE_OutputCDR& out,
-                                 ACE_CDR::Char x)
+                             ACE_CDR::Char x)
 {
   return this->write_1 (out,
                         ACE_reinterpret_cast (const ACE_CDR::Octet*,
-                                              &from_IBM1047[x]));
+                                              &from_IBM1047[(int) x]));
 }
 
 ACE_CDR::Boolean
 IBM1047_ISO8859::write_string (ACE_OutputCDR& out,
-                                   ACE_CDR::ULong len,
-                                   const ACE_CDR::Char* x)
+                               ACE_CDR::ULong len,
+                               const ACE_CDR::Char* x)
 {
   if (out.write_ulong (len + 1))
-    return this->write_char_array (out, x, len + 1);
+    {
+      return this->write_char_array (out, x, len + 1);
+    }
+
   return 0;
 }
 
 ACE_CDR::Boolean
 IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out,
-                                       const ACE_CDR::Char* x,
-                                       ACE_CDR::ULong len)
+                                   const ACE_CDR::Char* x,
+                                   ACE_CDR::ULong len)
 {
   char *buf;
+
   if (this->adjust (out, len, 1, buf) == 0)
     {
       ACE_OS::memcpy (buf, x, len);
 
-      for (ACE_CDR::ULong i = 0; i != len; ++i) {
-#if 0
-        ACE_DEBUG ((LM_DEBUG,"%x -> ",(unsigned char)buf[i]));
-#endif
-        buf[i] = (unsigned char)from_IBM1047[(unsigned char)buf[i]];
-#if 0
-        if (i == len-1)
-          ACE_DEBUG ((LM_DEBUG,"%x\n",(unsigned char)buf[i]));
-        else
-          ACE_DEBUG ((LM_DEBUG,"%x, ",(unsigned char)buf[i]));
-#endif
-      }
+      for (ACE_CDR::ULong i = 0; i != len; ++i) 
+        {
+          buf[i] = (unsigned char)from_IBM1047[(unsigned char)buf[i]];
+        }
 
       return 1;
     }