diff options
| -rw-r--r-- | ACEXML/common/URL_Addr.cpp | 8 | ||||
| -rw-r--r-- | ACEXML/common/URL_Addr.h | 5 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 |
4 files changed, 27 insertions, 0 deletions
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp index b5f156d5b91..08d5da0c376 100644 --- a/ACEXML/common/URL_Addr.cpp +++ b/ACEXML/common/URL_Addr.cpp @@ -59,6 +59,14 @@ ACEXML_URL_Addr::addr_to_string (int ipaddr_format) return this->addr_string_; } +#if defined (ACE_USES_WCHAR) +int +ACEXML_URL_Addr::string_to_addr (const char* s) +{ + return this->string_to_addr (ACE_TEXT_CHAR_TO_TCHAR (s)); +} +#endif /* ACE_USES_WCHAR */ + int ACEXML_URL_Addr::string_to_addr (const ACEXML_Char* s) { diff --git a/ACEXML/common/URL_Addr.h b/ACEXML/common/URL_Addr.h index bd24c1f06c3..fec3c560526 100644 --- a/ACEXML/common/URL_Addr.h +++ b/ACEXML/common/URL_Addr.h @@ -55,6 +55,11 @@ public: */ virtual int string_to_addr (const ACEXML_Char* address); + // Function to shut up Borland C++ +#if defined (ACE_USES_WCHAR) + virtual int string_to_addr (const char* address); +#endif + /** * Transform the current <ACE_INET_Addr> address into string format. If * <ipaddr_format> is non-0 this produces diff --git a/ChangeLog b/ChangeLog index 74170f2cb30..d512f8450b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Oct 04 22:24:23 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML\common\URL_Addr.cpp (string_to_addr): Added a new wrapper + which matches the signature in ACE_INET_Addr, and delegates the + work to the ACEXML_Char function to work around Borland BCB + warning about hidden virtual function. + Fri Oct 4 21:32:51 2002 Steve Huston <shuston@riverace.com> * ace/Service_Manager.cpp (list_services): Correct compiler diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 74170f2cb30..d512f8450b1 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Oct 04 22:24:23 2002 Krishnakumar B <kitty@cs.wustl.edu> + + * ACEXML\common\URL_Addr.cpp (string_to_addr): Added a new wrapper + which matches the signature in ACE_INET_Addr, and delegates the + work to the ACEXML_Char function to work around Borland BCB + warning about hidden virtual function. + Fri Oct 4 21:32:51 2002 Steve Huston <shuston@riverace.com> * ace/Service_Manager.cpp (list_services): Correct compiler |