ChangeLogTag: Thu Jun 6 17:41:24 2002 Krishnakumar B <kitty@cs.wustl.edu>

5 files changed, 13 insertions, 7 deletions

diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index 02d5826e30c..f9eebdac032 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -47,7 +47,7 @@ ACEXML_HttpCharStream::open (const ACEXML_Char *url)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "cannot convert URL"), -1);
 
   ACE_NEW_RETURN (this->connector_,
-                  ACEXML_Mem_Map_Stream::Connector (0, ACE_NONBLOCK),
+                  Connector (0, ACE_NONBLOCK),
                   -1);
 
   if (this->stream_->open (this->connector_, *this->url_addr_) == -1)
diff --git a/ACEXML/common/HttpCharStream.h b/ACEXML/common/HttpCharStream.h
index 02c9b5599ff..2b1e892392b 100644
--- a/ACEXML/common/HttpCharStream.h
+++ b/ACEXML/common/HttpCharStream.h
@@ -87,7 +87,7 @@ private:
 
   ACEXML_Mem_Map_Stream* stream_;
 
-  ACEXML_Mem_Map_Stream::Connector* connector_;
+  Connector* connector_;
 
   off_t size_;
 
diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp
index 1399648d0c9..7a255f5f112 100644
--- a/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACEXML/common/Mem_Map_Stream.cpp
@@ -133,7 +133,7 @@ ACEXML_Mem_Map_Stream::seek (off_t offset, int whence)
                                                  this->mem_map_.addr ());
 }
 
-ACEXML_Mem_Map_Stream::Svc_Handler *
+Svc_Handler *
 ACEXML_Mem_Map_Stream::svc_handler (void)
 {
   return this->svc_handler_;
@@ -247,7 +247,13 @@ ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Svc_Tuple<Svc_Handler>;
+template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Svc_Tuple<Svc_Handler>
+#pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/Mem_Map_Stream.h b/ACEXML/common/Mem_Map_Stream.h
index 7300630c18c..1849bca9d8f 100644
--- a/ACEXML/common/Mem_Map_Stream.h
+++ b/ACEXML/common/Mem_Map_Stream.h
@@ -25,7 +25,8 @@
 #include "ACEXML/common/ACEXML_Export.h"
 #include "ACEXML/common/XML_Types.h"
 
-
+typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> Svc_Handler;
+typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> Connector;
 
 /**
  * @class ACEXML_Mem_Map_Stream Mem_Map_Stream.h "ACEXML/common/Mem_Map_Stream.h"
@@ -54,8 +55,6 @@
 class ACEXML_Export ACEXML_Mem_Map_Stream
 {
 public:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> Svc_Handler;
-  typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> Connector;
   /// Default constructor
   ACEXML_Mem_Map_Stream (void);
 
@@ -185,4 +184,5 @@ private:
 
 };
 
+
 #endif /* _ACEXML_MEM_MAP_STREAM_H */
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index e1c9d9ebab6..112cebb749a 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -83,7 +83,7 @@ ACEXML_URL_Addr::string_to_addr (const ACEXML_Char *s)
   if (s == 0)
     return -1;
 
-  char* http = "http://";
+  const char* http = "http://";
   int http_len = ACE_OS::strlen (http);
 
   // Check validity of URL