Tue Mar 22 11:45:57 2005 Will Otte <wotte@dre.vanderbilt.edu>

5 files changed, 54 insertions, 9 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 71193e091f2..b1819db5a00 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Mar 22 11:45:57 2005  Will Otte <wotte@dre.vanderbilt.edu>
+	
+	* DAnCE/Config_Handlers/ADD_Handler.cpp
+	* DAnCE/Config_Handlers/Any_Handler.cpp
+	* DAnCE/Config_Handlers/CCD_Handler.cpp
+	* DAnCE/Config_Handlers/XSCRT/Elements.hpp
+	
+	Changes to accomodate broken compilers (VC6).
+	
 Tue Mar 22 10:40:21 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
         * DAnCE/examples/Swapping/Sender/Sender_exec.cpp:
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
index 73e6d77d313..ab7e104b823 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/ADD_Handler.cpp
@@ -171,17 +171,17 @@ namespace CIAO
         }
         
       total = src.source.length ();
-      for (size_t i = 0; i < total; ++i)
+      for (size_t j = 0; j < total; ++j)
         {
-          XMLSchema::string< char > curr ((src.source[i]));
+          XMLSchema::string< char > curr ((src.source[j]));
           add.add_source (curr);
         }  
       
       total = src.execParameter.length ();
-      for (size_t i = 0; i < total; ++i)
+      for (size_t k = 0; k < total; ++k)
         {
           add.add_execParameter (
-            Property_Handler::get_property (src.execParameter[i])
+            Property_Handler::get_property (src.execParameter[k])
           );
         }
         
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
index 9387da1251b..60da61ee47f 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
@@ -55,7 +55,6 @@ namespace CIAO
         {
           toconfig <<= 
             CORBA::Boolean (static_cast <bool &> (value.boolean ()));
-
         }
       else if (value.double_p ())
         {
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp
index 3f65b237bdc..d1cb5f8566c 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/CCD_Handler.cpp
@@ -170,14 +170,14 @@ namespace CIAO
        }
      
      total = src.idlFile.length ();
-     for (size_t j = 0; i < total; ++j)
+     for (size_t j = 0; j < total; ++j)
        {
          XMLSchema::string< char > curr ((src.idlFile[j]));
          cid.add_idlFile (curr);
        }
 
      total = src.configProperty.length ();
-     for (size_t k = 0; i < total; ++k)
+     for (size_t k = 0; k < total; ++k)
        {
          cid.add_configProperty (
            Property_Handler::get_property (
@@ -185,7 +185,7 @@ namespace CIAO
        }
      
      total = src.port.length ();
-     for (size_t l = 0; i < total; ++l)
+     for (size_t l = 0; l < total; ++l)
        {
          cid.add_port (
            CPD_Handler::component_port_description (
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
index 09c4f80b384..bf86d0f4c7d 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/Elements.hpp
@@ -14,9 +14,10 @@
 
 #if defined (_MSC_VER) && (_MSC_VER < 1300)
 
-#pragma warning(disable:4786)
+
 // Stuff for broken VC6. Don't like what you see - use better compiler!
 //
+#pragma warning(disable:4786)
 
 inline
 std::wistream&
@@ -54,6 +55,42 @@ operator<< (std::wostream& os, unsigned __int64 const& v)
   return os;
 }
 
+inline
+std::istream&
+operator>> (std::istream& is, __int64& v)
+{
+  long t;
+  is >> t;
+  v = t;
+  return is;
+}
+
+inline
+std::istream&
+operator>> (std::istream& is, unsigned __int64& v)
+{
+  unsigned long t;
+  is >> t;
+  v = t;
+  return is;
+}
+
+inline
+std::ostream&
+operator<< (std::ostream& os, __int64 const& v)
+{
+  os << long (v);
+  return os;
+}
+
+inline
+std::ostream&
+operator<< (std::ostream& os, unsigned __int64 const& v)
+{
+  os << unsigned long (v);
+  return os;
+}
+
 #endif
 
 namespace XSCRT