ChangeLogTag: Wed Aug 17 11:16:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 15 insertions, 51 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b2ea8991328..0f8ff690629 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,17 @@
+Tue Aug 16 18:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Removed pragma push/pop for msvs, those warnings are already
+          disabled in general
+
+        * tao/Array_VarOut_T.{h,inl}:
+          In the TAO_Array_Forany_T make the pointer in the constructor
+          const to get things compiling with the new any insertion
+
 Mon Aug 15 19:56:10 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_nodule/module_ch.cpp:
-        
+
           Where namespace openings and closings are generated, add
           generation of the same openings and closings in the *A.h
           file, if the -GA option is being used. This change ensures
@@ -12,20 +22,20 @@ Mon Aug 15 19:52:50 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/PI/PICurrent_Loader.cpp:
         * tao/PI/PICurrent_Loader.h:
-        
+
           Change library name in ACE_FACTORY_DEFINE and ACE_FACTORY_DECLARE
           to TAO_PI (where the modified files are located) instad of TAO.
 
 Mon Aug 15 19:14:16 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
-        
+
           Added #include of "tao/AnyTypeCode/Any.h".
 
 Mon Aug 15 19:10:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/PortableGroup.mpc:
-        
+
           Removed the extra subgroup labeled OBRSVCS_COMPONENTS. This is
           not used on any platform and it creates an extra subdirectory
           in the MSVC 7.1 solution browser.
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index caa26fab959..86b26ddc674 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -243,17 +243,6 @@ TAO_CodeGen::start_client_header (const char *fname)
   *this->client_header_ << "#define TAO_EXPORT_MACRO "
                         << be_global->stub_export_macro ();
 
-  *this->client_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#pragma warning(push)\n"
-                        << "#pragma warning(disable:4250)";
-
-  if (be_global->use_raw_throw ())
-    {
-      *this->client_header_ << "\n#pragma warning(disable:4290)";
-    }
-
-  *this->client_header_ << "\n#endif /* _MSC_VER */";
-
   return 0;
 }
 
@@ -461,18 +450,6 @@ TAO_CodeGen::start_server_header (const char *fname)
         }
     }
 
-  *this->server_header_ << be_nl << be_nl
-                        << "#if defined(_MSC_VER)\n"
-                        << "#pragma warning(push)\n"
-                        << "#pragma warning(disable:4250)";
-
-  if (be_global->use_raw_throw ())
-    {
-      *this->server_header_ << "\n#pragma warning(disable:4290)";
-    }
-
-  *this->server_header_ << "\n#endif /* _MSC_VER */";
-
   if (be_global->skel_export_include () != 0)
     {
       *this->server_header_ << "\n\n#include \""
@@ -540,17 +517,6 @@ TAO_CodeGen::start_server_template_header (const char *fname)
                                      << "\"";
     }
 
-  *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n"
-                                 << "#pragma warning(push)\n"
-                                 << "#pragma warning(disable:4250)\n";
-
-  if (be_global->use_raw_throw ())
-    {
-      *this->server_template_header_ << "#pragma warning(disable:4290)\n";
-    }
-
-  *this->server_template_header_ << "#endif /* _MSC_VER */\n";
-
   return 0;
 }
 
@@ -1072,10 +1038,6 @@ TAO_CodeGen::end_client_header (void)
       *this->client_header_ << "#endif /* defined INLINE */";
     }
 
-  *this->client_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#pragma warning(pop)\n"
-                        << "#endif /* _MSC_VER */";
-
   // Code to put the last #endif.
   *this->client_header_ << "\n\n";
 
@@ -1117,10 +1079,6 @@ TAO_CodeGen::end_server_header (void)
       *this->server_header_ << "#endif /* defined INLINE */";
     }
 
-  *this->server_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#pragma warning(pop)\n"
-                        << "#endif /* _MSC_VER */";
-
   // Code to put the last #endif.
   *this->server_header_ << "\n\n";
 
@@ -1220,10 +1178,6 @@ TAO_CodeGen::end_server_template_header (void)
       << "\")";
   *this->server_template_header_ << "\n#endif /* defined REQUIRED PRAGMA */";
 
-  *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n"
-                                 << "#pragma warning(pop)\n"
-                                 << "#endif /* _MSC_VER */";
-
   // Code to put the last #endif.
   *this->server_template_header_ << "\n\n";
 
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 1c6754f5847..3f46183a1f5 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -157,7 +157,7 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet>
       return;
     }
 
-  u_int length = ACE_OS::strlen (str);
+  size_t length = ACE_OS::strlen (str);
   const char *eos = str + length;
   const char *cp = str;