ChangeLogTag: Tue Apr 29 11:21:40 2003 Chad Elliott <elliott_c@ociweb.com>

9 files changed, 35 insertions, 32 deletions

diff --git a/ACEXML/common/AttributesImpl.cpp b/ACEXML/common/AttributesImpl.cpp
index 95eb4c2742b..6866c31e268 100644
--- a/ACEXML/common/AttributesImpl.cpp
+++ b/ACEXML/common/AttributesImpl.cpp
@@ -34,7 +34,7 @@ ACEXML_AttributesImpl::addAttribute (const ACEXML_Char *uri,
 {
   if (this->isDuplicate (uri, localName, qName))
     return -1;
-  int length = this->attrs_.size ();
+  size_t length = this->attrs_.size ();
   this->attrs_.size (length+1);
   this->setAttribute (length,
                       uri,
@@ -42,7 +42,7 @@ ACEXML_AttributesImpl::addAttribute (const ACEXML_Char *uri,
                       qName,
                       type,
                       value);
-  return length;
+  return ACE_static_cast (int, length);
 }
 
 int
@@ -50,10 +50,10 @@ ACEXML_AttributesImpl::addAttribute (const ACEXML_Attribute &att)
 {
   if (this->isDuplicate (att.uri(), att.localName(), att.qName()))
     return -1;
-  int length = this->attrs_.size ();
+  size_t length = this->attrs_.size ();
   this->attrs_.size (length+1);
   this->attrs_[length] = att;
-  return length;
+  return ACE_static_cast (int, length);
 }
 
 int
@@ -97,7 +97,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *qName)
 {
   for (size_t i = 0; i < this->attrs_.size (); i++)
     if (ACE_OS::strcmp (qName, this->attrs_[i].qName ()) == 0)
-      return i;
+      return ACE_static_cast (int, i);
 
   return -1;
 }
@@ -109,7 +109,7 @@ ACEXML_AttributesImpl::getIndex (const ACEXML_Char *uri,
   for (size_t i = 0; i < this->attrs_.size (); i++)
     if (ACE_OS::strcmp (uri, this->attrs_[i].uri ()) == 0 &&
         ACE_OS::strcmp (localPart, this->attrs_[i].localName ()) == 0)
-      return i;
+      return ACE_static_cast (int, i);
 
   return -1;
 }
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp
index 5b989173d2e..7592d2f622a 100644
--- a/ACEXML/common/FileCharStream.cpp
+++ b/ACEXML/common/FileCharStream.cpp
@@ -122,7 +122,7 @@ int
 ACEXML_FileCharStream::read (ACEXML_Char *str,
                              size_t len)
 {
-  return ACE_OS::fread (str, len, 1, this->infile_);
+  return ACE_static_cast (int, ACE_OS::fread (str, len, 1, this->infile_));
 }
 
 int
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index 83426595168..fabd156852a 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -75,7 +75,7 @@ ACEXML_HttpCharStream::open (const ACEXML_Char *url)
                        "Refer HTTP/1.1 for details"), -1);
   }
 
-  this->size_ = len;
+  this->size_ = ACE_static_cast (off_t, len);
   return 0;
 }
 
@@ -245,11 +245,11 @@ ACEXML_HttpCharStream::send_request (void)
 {
   char* path = ACE::strnew (ACE_TEXT_ALWAYS_CHAR (this->url_addr_->get_path_name()));
   ACE_Auto_Basic_Array_Ptr<char> path_ptr (path);
-  int commandsize = ACE_OS::strlen (path)
-                    + ACE_OS::strlen (this->url_addr_->get_host_name ())
-                    + 20     // Extra
-                    + 1      // NUL byte
-                    + 16 ;   // Protocol filler...
+  size_t commandsize = ACE_OS::strlen (path)
+                       + ACE_OS::strlen (this->url_addr_->get_host_name ())
+                       + 20     // Extra
+                       + 1      // NUL byte
+                       + 16 ;   // Protocol filler...
 
   char* command;
   ACE_NEW_RETURN (command, char[commandsize], -1);
@@ -275,7 +275,7 @@ ACEXML_HttpCharStream::send_request (void)
 int
 ACEXML_HttpCharStream::available (void)
 {
-  return this->stream_->available();
+  return ACE_static_cast (int, this->stream_->available());
 }
 
 int
@@ -316,7 +316,7 @@ ACEXML_HttpCharStream::read (ACEXML_Char *str,
   str = ACE_TEXT_CHAR_TO_TCHAR (temp);
   if (str == 0)
     return -1;
-  return len;
+  return ACE_static_cast (int, len);
 }
 
 int
diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp
index 818bd11b230..2513005e3bb 100644
--- a/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACEXML/common/Mem_Map_Stream.cpp
@@ -71,7 +71,7 @@ ACEXML_Mem_Map_Stream::recv (size_t &len)
     return 0;
 
   const char *s = this->recv_pos_;
-  this->seek (len, SEEK_CUR);
+  this->seek (ACE_static_cast (off_t, len), SEEK_CUR);
   len = this->get_pos_ - s;
   return s;
 }
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp
index b28b9d07248..5984b45c2e9 100644
--- a/ACEXML/common/NamespaceSupport.cpp
+++ b/ACEXML/common/NamespaceSupport.cpp
@@ -208,12 +208,12 @@ ACEXML_NamespaceSupport::processName (const ACEXML_Char *qName,
                                       const ACEXML_Char *&name,
                                       int is_attribute) const
 {
-  int qlen = ACE_OS_String::strlen (qName);
+  size_t qlen = ACE_OS_String::strlen (qName);
   int len = -1;
-  for (int i = 0; i < qlen; ++i)
+  for (size_t i = 0; i < qlen; ++i)
     if (qName [i] == ':')
       {
-        len = i;
+        len = ACE_static_cast (int, i);
         break;
       }
 
diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp
index 26211eeff70..1a2ea6fe93b 100644
--- a/ACEXML/common/StrCharStream.cpp
+++ b/ACEXML/common/StrCharStream.cpp
@@ -115,7 +115,7 @@ ACEXML_StrCharStream::read (ACEXML_Char *str,
 
       ACE_OS_String::strncpy (str, this->ptr_, len);
       this->ptr_ += len;
-      return len;
+      return ACE_static_cast (int, len);
     }
   return 0;
 }
diff --git a/ACEXML/common/Transcode.cpp b/ACEXML/common/Transcode.cpp
index 4007d346494..ed0a9494d25 100644
--- a/ACEXML/common/Transcode.cpp
+++ b/ACEXML/common/Transcode.cpp
@@ -40,7 +40,7 @@ ACEXML_Transcoder::utf8s2utf16s (const ACEXML_UTF8 *src,
       len -= forward;
     }
 
-  return total_len;
+  return ACE_static_cast (int, total_len);
 }
 
 int
@@ -79,5 +79,5 @@ ACEXML_Transcoder::utf16s2utf8s (const ACEXML_UTF16 *src,
       len -= forward;
     }
 
-  return total_len;
+  return ACE_static_cast (int, total_len);
 }
diff --git a/ACEXML/common/Transcode.i b/ACEXML/common/Transcode.i
index e9ec3936e80..a267fa8ec57 100644
--- a/ACEXML/common/Transcode.i
+++ b/ACEXML/common/Transcode.i
@@ -203,7 +203,7 @@ ACEXML_Transcoder::utf82ucs4 (const ACEXML_UTF8 *the_src,
   else
     return NON_UNICODE;
 
-  return forward;
+  return ACE_static_cast (int, forward);
 }
 
 ACEXML_INLINE int
@@ -230,5 +230,5 @@ ACEXML_Transcoder::utf162ucs4 (const ACEXML_UTF16 *src,
       dst = *src;
     }
 
-  return forward;
+  return ACE_static_cast (int, forward);
 }
diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp
index 3c94ce538a9..d3a0b80d1bb 100644
--- a/ACEXML/parser/parser/Parser.cpp
+++ b/ACEXML/parser/parser/Parser.cpp
@@ -644,7 +644,9 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
           if (cdata_length != 0)
             {
               cdata = this->obstack_.freeze ();
-              this->content_handler_->characters (cdata, 0, cdata_length ACEXML_ENV_ARG_PARAMETER);
+              this->content_handler_->characters (cdata, 0,
+                                         ACE_static_cast (int, cdata_length)
+                                         ACEXML_ENV_ARG_PARAMETER);
               ACEXML_CHECK;
               this->obstack_.unwind (cdata);
               cdata_length = 0;
@@ -755,9 +757,9 @@ ACEXML_Parser::parse_element (int is_root ACEXML_ENV_ARG_DECL)
           if (cdata == 0)
             {
               cdata = this->obstack_.freeze ();
-              this->content_handler_->characters (cdata,
-                                                  0,
-                                                  cdata_length ACEXML_ENV_ARG_PARAMETER);
+              this->content_handler_->characters (cdata, 0,
+                                           ACE_static_cast (int, cdata_length)
+                                           ACEXML_ENV_ARG_PARAMETER);
               ACEXML_CHECK;
               this->obstack_.grow (ch);
               cdata_length = 1;   // the missing char.
@@ -922,9 +924,9 @@ ACEXML_Parser::parse_cdata (ACEXML_ENV_SINGLE_ARG_DECL)
           if (ch == '>')        // Yay!
             {
               cdata = this->obstack_.freeze ();
-              this->content_handler_->characters (cdata,
-                                                  0,
-                                                  datalen ACEXML_ENV_ARG_PARAMETER);
+              this->content_handler_->characters (cdata, 0,
+                                                  ACE_static_cast (int, datalen)
+                                                  ACEXML_ENV_ARG_PARAMETER);
               // ACEXML_CHECK_RETURN (-1);
               this->obstack_.unwind(cdata);
               return 0;
@@ -974,7 +976,8 @@ ACEXML_Parser::try_grow_cdata (size_t size, size_t &len ACEXML_ENV_ARG_DECL)
             }
           this->content_handler_->characters (cdata,
                                               0,
-                                              len ACEXML_ENV_ARG_PARAMETER);
+                                              ACE_static_cast (int, len)
+                                              ACEXML_ENV_ARG_PARAMETER);
           ACEXML_CHECK_RETURN (-1);
           len = 0;              // reset counter
           if (this->obstack_.request (size) == 0)