Merged revisions 80780-80781,80787,80789,80805-80806,80823 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO

........
  r80780 | johnnyw | 2008-02-29 04:54:47 -0600 (Fri, 29 Feb 2008) | 1 line
  
  Fri Feb 28 10:54:37 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r80781 | parsons | 2008-02-29 10:30:45 -0600 (Fri, 29 Feb 2008) | 1 line
  
  ChangeLogTag: Fri Feb 29 16:24:43 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
........
  r80787 | johnnyw | 2008-03-01 00:52:23 -0600 (Sat, 01 Mar 2008) | 1 line
........
  r80789 | wotte | 2008-03-01 13:15:48 -0600 (Sat, 01 Mar 2008) | 1 line
  
  Sat Mar  1 19:14:30 UTC 2008  William Otte  <wotte@dre.vanderbilt.edu>
........
  r80805 | johnnyw | 2008-03-03 08:53:30 -0600 (Mon, 03 Mar 2008) | 1 line
  
  Mon Mar  3 14:52:30 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r80806 | mitza | 2008-03-03 09:17:37 -0600 (Mon, 03 Mar 2008) | 1 line
  
  removed stray conflict marker
........
  r80823 | johnnyw | 2008-03-04 04:11:35 -0600 (Tue, 04 Mar 2008) | 1 line
  
  Tue Mar  4 10:10:30 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........

22 files changed, 78 insertions, 56 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 368ff89f908..82f823fcc45 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,12 +1,58 @@
+Tue Mar  4 10:10:30 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Table.{h,cpp,inl}:
+          Removed obsolete methods and members
+
+        * tao/PI/Interceptor_List_T.{h,cpp}:
+          Const changes
+
+        * tao/Policy_Validator.h:
+        * tao/TAO_Server_Request.h:
+          Layout changes
+
+Mon Mar  3 14:52:30 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Generator_Parser.h:
+        * tao/GIOP_Message_Generator_Parser_10.h:
+        * tao/GIOP_Message_Generator_Parser_11.h:
+        * tao/GIOP_Message_Generator_Parser_12.h:
+        * tao/GIOP_Message_Generator_Parser_Impl.h:
+          No need to export these classes from the TAO library
+
+Sat Mar  1 19:14:30 UTC 2008  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/mcpp.mpb:
+        * TAO_IDL/contrib/mcpp/directive.cpp:
+        * TAO_IDL/contrib/mcpp/expand.cpp:
+        * TAO_IDL/contrib/mcpp/main.cpp:
+        * TAO_IDL/driver/drv_mcpp_preproc.cpp:
+        * TAO_IDL/preproc.mpb:
+
+          Fuzz fixes.
+
+Fri Feb 29 16:24:43 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+
+          Fixed signed/unsigned mismatch warning on Debian, introduced
+          by changes in
+
+          Thu Feb 28 19:16:43 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+Fri Feb 28 10:54:37 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_3154_Regression/run_test.pl:
+          Updated for VxWorks cross platform testing
+
 Thu Feb 28 19:16:43 UTC 2008  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/IFRService/EnumDef_i.h:
         * orbsvcs/orbsvcs/IFRService/ConstantDef_i.h:
-        
+
           Cosmetic changes.
-          
+
         * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-        
+
           Changed creation of IOR output file to use
           ACE_DEFAULT_FILE_PERMS. Also added more error checking to
           cover the open, write and close steps. Thanks to Jules
@@ -23,7 +69,7 @@ Thu Feb 28 13:26:12 UTC 2008  William R. Otte  <wotte@dre.vanderbilt.edu>
         * TAO_IDL/contrib/mcpp/system.cpp:
 
           Compile error fixes.
-        
+
 Thu Feb 28 06:01:19 UTC 2008  Sumant Tambe  <sutambe@nospam>
 
         * TAO_IDL/contrib/mcpp/main.cpp:
diff --git a/TAO/MPC/config/mcpp.mpb b/TAO/MPC/config/mcpp.mpb
index 96206ee1c7a..515e5bbdb6f 100644
--- a/TAO/MPC/config/mcpp.mpb
+++ b/TAO/MPC/config/mcpp.mpb
@@ -1,3 +1,4 @@
+// $Id$
 feature(mcpp) {
   after += TAO_IDL_MCPP
   includes += $(TAO_ROOT)/TAO_IDL/contrib/mcpp
diff --git a/TAO/TAO_IDL/contrib/mcpp/directive.cpp b/TAO/TAO_IDL/contrib/mcpp/directive.cpp
index 7b290b8ccee..298ef2f014b 100644
--- a/TAO/TAO_IDL/contrib/mcpp/directive.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/directive.cpp
@@ -1276,7 +1276,7 @@ DEFBUF *    install_macro(
         dp->parmnames = (char *)dp + sizeof (DEFBUF) + s_name;
         dp->repl = dp->parmnames + s_parmnames;
         if (mcpp_mode == STD)
-	  ACE_OS::memcpy( dp->parmnames, parmnames, s_parmnames);
+          ACE_OS::memcpy( dp->parmnames, parmnames, s_parmnames);
     } else {
         dp->repl = (char *)dp + sizeof (DEFBUF) + s_name;
     }
diff --git a/TAO/TAO_IDL/contrib/mcpp/expand.cpp b/TAO/TAO_IDL/contrib/mcpp/expand.cpp
index 209dba2232c..a5350137d37 100644
--- a/TAO/TAO_IDL/contrib/mcpp/expand.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/expand.cpp
@@ -385,7 +385,7 @@ static DEFBUF * def_special(
             diag_macro( CWARN
                     , "Line number %.0s\"%ld\" is out of range"     /* _W1_ */
                     , 0, src_line, 0, defp, 0);
-	ACE_OS::sprintf( defp->repl, "%ld", src_line);      /* Re-define    */
+        ACE_OS::sprintf( defp->repl, "%ld", src_line);      /* Re-define    */
         break;
     case DEF_NOARGS - 4:                    /* __FILE__             */
         for (file = infile; file != 0; file = file->parent) {
diff --git a/TAO/TAO_IDL/contrib/mcpp/main.cpp b/TAO/TAO_IDL/contrib/mcpp/main.cpp
index 28ee2a632c2..d3d8aa5d791 100644
--- a/TAO/TAO_IDL/contrib/mcpp/main.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/main.cpp
@@ -737,7 +737,7 @@ static void mcpp_main( void)
                     char *  tp = out_ptr;
                     while (*tp == ' ')
                         tp++;           /* Remove excessive spaces  */
-		    ACE_OS::memmove( out_ptr, tp, ACE_OS::strlen( tp) + 1);
+                    ACE_OS::memmove( out_ptr, tp, ACE_OS::strlen( tp) + 1);
                     wp -= (tp - out_ptr);
                 }
                 if (has_pragma) {           /* Found _Pramga()      */
@@ -933,7 +933,7 @@ static void devide_line(
             *out_ptr = EOS;
             put_a_line( out);           /* Putout the former tokens */
             wp = out_ptr = stpcpy( out, save);      /* Restore the token    */
-	        ACE_OS::free( save);
+                ACE_OS::free( save);
         } else {                            /* Still in size        */
             out_ptr = wp;                   /* Advance the pointer  */
         }
@@ -1112,7 +1112,7 @@ static char *   esc_mbchar(
                 c = *(cp - 1);
                 if (c == '\\' || c == '"' || c == '\'') {
                                     /* Insert \ before 0x5c, 0x22, 0x27 */
-		  ACE_OS::memmove( cp, cp - 1, (size_t) (str_end - cp) + 2);
+                  ACE_OS::memmove( cp, cp - 1, (size_t) (str_end - cp) + 2);
                     *(cp++ - 1) = '\\';
                     str++;
                     str_end++;
diff --git a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
index 28a19727e78..31a8c223b17 100644
--- a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
@@ -1038,8 +1038,8 @@ if (ACE_OS::rename (tmp_file, t_file) != 0)
  if (mcpp_lib_main (DRV_argcount, tmp_arglist) != 0)
    {
      ACE_ERROR ((LM_ERROR,
-		 "%s: mcpp preprocessor execution failed\n",
-		 idl_global->prog_name ()));
+                 "%s: mcpp preprocessor execution failed\n",
+                 idl_global->prog_name ()));
      throw Bailout ();
    }
 
diff --git a/TAO/TAO_IDL/preproc.mpb b/TAO/TAO_IDL/preproc.mpb
index f3b4a0d1dac..84b7c246853 100644
--- a/TAO/TAO_IDL/preproc.mpb
+++ b/TAO/TAO_IDL/preproc.mpb
@@ -1,3 +1,4 @@
+// $Id$
 feature(mcpp) {
   Source_Files {
     driver/drv_mcpp_preproc.cpp
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 5a3f08b3858..d8bc07b3390 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -349,7 +349,7 @@ TAO_IFR_Server::create_repository (void)
   size_t ior_size = ACE_OS::strlen (ifr_ior) + 1; 
   ssize_t result = ACE_OS::write (fd, ifr_ior, ior_size);
   
-  if (result != ior_size)
+  if (result != static_cast<ssize_t> (ior_size))
     {
       ACE_OS::unlink (ior_filename);
       ACE_OS::close (fd);
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
index a4fa0b151cc..6457deefb45 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
@@ -19,7 +19,7 @@ if (PerlACE::is_vxworks_test()) {
     $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process (""../../../IFR_Service/IFR_Service", "-o $iorfile");
+    $SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index a12eaa4cc83..e8530618860 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -45,7 +45,7 @@ class TAO_ServerRequest;
  * which version do we need to use to send messages.
  */
 
-class TAO_Export TAO_GIOP_Message_Generator_Parser
+class TAO_GIOP_Message_Generator_Parser
 {
 public:
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index c71e26356bf..df932b4a9f2 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  */
 
-class TAO_Export TAO_GIOP_Message_Generator_Parser_10:
+class TAO_GIOP_Message_Generator_Parser_10:
   public TAO_GIOP_Message_Generator_Parser
 {
 public:
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h
index 7f93c88a3e8..324a23b032c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h
@@ -32,7 +32,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  the 1.0 class.
  *
  */
-class TAO_Export TAO_GIOP_Message_Generator_Parser_11
+class TAO_GIOP_Message_Generator_Parser_11
   : public TAO_GIOP_Message_Generator_Parser_10
 {
 public:
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index efbfebb4923..2ee3ab574f3 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -33,7 +33,7 @@ class TAO_Transport;
  *
  */
 
-class TAO_Export TAO_GIOP_Message_Generator_Parser_12:
+class TAO_GIOP_Message_Generator_Parser_12:
   public TAO_GIOP_Message_Generator_Parser
 {
 public:
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
index 9dad728f19b..638139b7e6c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
@@ -38,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  versions in the higher versions.
  */
 
-class TAO_Export TAO_GIOP_Message_Generator_Parser_Impl
+class TAO_GIOP_Message_Generator_Parser_Impl
 {
 public:
 
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 8624370348c..70e1dda62ac 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -23,9 +23,7 @@ TAO::ORB_Table::ORB_Table (void)
   : lock_ (),
     first_orb_not_default_ (false),
     table_ (TAO_DEFAULT_ORB_TABLE_SIZE),
-    first_orb_ (0),
-    orbs_ (0),
-    num_orbs_ (0)
+    first_orb_ (0)
 {
 }
 
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index 5365b0b04f4..d2e638ed91b 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -99,8 +99,6 @@ namespace TAO
     int unbind (const char *orb_id);
     //@}
 
-    ::TAO_ORB_Core * const * get_orbs (size_t& num_orbs);
-
     /// Obtain the first ORB for the @c ORB_Core_instance()
     /// implementation.
     ::TAO_ORB_Core * first_orb (void);
@@ -146,16 +144,6 @@ namespace TAO
 
     /// The first ORB created by the user
     ::TAO_ORB_Core * first_orb_;
-
-    /// List of orbs for get_orbs call
-    /**
-     * @todo ORB_Table::orbs_ appears to be unused.  Remove it?
-     */
-    ::TAO_ORB_Core ** orbs_;
-
-    /// Number of ORBs in the table.
-    size_t num_orbs_;
-
   };
 
   // -----------------------------------------------
@@ -190,9 +178,7 @@ namespace TAO
     ::TAO_ORB_Core * core (void) const { return this->core_; }
 
   private:
-
     ::TAO_ORB_Core * core_;
-
   };
 
 }
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index 40cb80e4d70..b047b8f0493 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -26,13 +26,6 @@ TAO::ORB_Table::end (void)
   return this->table_.end ();
 }
 
-ACE_INLINE ::TAO_ORB_Core* const *
-TAO::ORB_Table::get_orbs (size_t& num_orbs)
-{
-  num_orbs = this->num_orbs_;
-  return this->orbs_;
-}
-
 /// Accessor to the underlying table_
 ACE_INLINE TAO::ORB_Table::Table *
 TAO::ORB_Table::table (void)
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index a94957a33d0..d618f78a3de 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -34,7 +34,7 @@ namespace TAO
 
   template <typename InterceptorType, typename DetailsType>
   size_t
-  Interceptor_List<InterceptorType,DetailsType>::size (void)
+  Interceptor_List<InterceptorType,DetailsType>::size (void) const
   {
     return this->interceptors_.size ();
   }
@@ -166,7 +166,7 @@ namespace TAO
         details.apply_policies(policies);
 
         /// Increase the length of the Interceptor sequence by one.
-        const size_t new_len = old_len + 1;
+        size_t const new_len = old_len + 1;
         this->interceptors_.size (new_len);
 
         // Add the interceptor
diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h
index 6a15e8f1b4c..7a7d49c71dc 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -78,10 +78,9 @@ namespace TAO
     /// Return the interceptor in sequence element @a index.
     InterceptorType_ptr_type interceptor (size_t index);
 
-    size_t size (void);
+    size_t size (void) const;
 
   private:
-
     typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray;
 
     /// Dynamic array of registered interceptors.
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index fdb948bb7d3..d91dd67a122 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -49,7 +49,6 @@ namespace CORBA
  *  for the policies in the POA. This class seems so much useful for
  *  passing policy information between different loaded libraries.
  */
-
 class TAO_Export TAO_Policy_Validator
 {
 public:
@@ -88,10 +87,9 @@ public:
    */
   void add_validator (TAO_Policy_Validator *validator);
 
-
- /**
-  * Accessor for the stored ORB core reference
-  */
+  /**
+   * Accessor for the stored ORB core reference
+   */
  TAO_ORB_Core & orb_core() const;
 
 protected:
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 709a19aa588..f0cd4e25724 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -137,9 +137,7 @@ public:
   const char *operation (void) const;
 
   /// Set the operation name.
-  void operation (const char *operation,
-                  size_t length,
-                  int release);
+  void operation (const char *operation, size_t length, int release);
 
   /// Return the length of the operation.
   size_t operation_length (void) const;
diff --git a/TAO/tests/Bug_3154_Regression/run_test.pl b/TAO/tests/Bug_3154_Regression/run_test.pl
index f6e64e0c3c4..2e00c4e7969 100755
--- a/TAO/tests/Bug_3154_Regression/run_test.pl
+++ b/TAO/tests/Bug_3154_Regression/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $tao_idl = "$PerlACE::ACE_ROOT/bin/tao_idl";
 if (exists $ENV{HOST_ROOT}) {
-    $tao_idl = "/bin/tao_idl";
+    $tao_idl = "$ENV{HOST_ROOT}/bin/tao_idl";
 }
 
 # IDL file names
@@ -18,7 +18,9 @@ $idl_file = PerlACE::LocalFile ("test.idl");
 
 # The IDL compiler
 $TAO_IDL = new PerlACE::Process ("$tao_idl");
-
+if (exists $ENV{HOST_ROOT}) {
+  $TAO_IDL->IgnoreHostRoot(1);
+}
 $ENV{'INCLUDE'} = ":$ENV{TAO_ROOT}/orbsvcs/:$ENV{TAO_ROOT}/:";
 
 $TAO_IDL->Arguments ("-Se -hs _skel.h -hc _stub.h -I$ENV{TAO_ROOT} -I$ENV{TAO_ROOT}/orbsvcs/ test.idl");