From bb7da47f3bcd674074a9d59279b96b20df187c58 Mon Sep 17 00:00:00 2001 From: dhinton Date: Fri, 10 May 2002 14:02:41 +0000 Subject: ChangeLogTag:Fri May 10 13:58:47 UTC 2002 Don Hinton --- ASNMP/asnmp/address.cpp | 24 +++++++++++++----------- ASNMP/asnmp/octet.cpp | 3 ++- ASNMP/asnmp/oid.cpp | 1 + ASNMP/asnmp/vb.cpp | 4 ++-- ASNMP/examples/set/set.cpp | 1 + ChangeLog | 21 +++++++++++++++++++++ ChangeLogs/ChangeLog-02a | 21 +++++++++++++++++++++ ChangeLogs/ChangeLog-03a | 21 +++++++++++++++++++++ examples/DLL/Newsweek.cpp | 1 + examples/DLL/Today.cpp | 1 + examples/Web_Crawler/URL_Addr.cpp | 2 ++ examples/Web_Crawler/URL_Addr.h | 1 + 12 files changed, 87 insertions(+), 14 deletions(-) diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp index 230788e9f67..77da41ec76e 100644 --- a/ASNMP/asnmp/address.cpp +++ b/ASNMP/asnmp/address.cpp @@ -37,6 +37,8 @@ =====================================================================*/ #include "asnmp/address.h" +#include "ace/OS_String.h" +#include "ace/os_include/ctype.h" ACE_RCSID(asnmp, address, "$Id$") @@ -88,7 +90,7 @@ unsigned char& Address::operator[]( const int position) // overloaded equivlence operator, are two addresses equal? int operator==( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)==0) + if ( ACE_OS_String::strcmp( (const char*) lhs, (const char*)rhs)==0) return 1; else return 0; @@ -106,7 +108,7 @@ int operator!=( const Address &lhs, const Address &rhs) // overloaded > operator, is a1 > a2 int operator>( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)>0) + if ( ACE_OS_String::strcmp( (const char*) lhs, (const char*)rhs)>0) return 1; else return 0; @@ -136,7 +138,7 @@ int operator<=( const Address &lhs,const Address &rhs) // overloaded < operator, is a1 < a2 int operator<( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)<0) + if ( ACE_OS_String::strcmp( (const char*) lhs, (const char*)rhs)<0) return 1; else return 0; @@ -148,7 +150,7 @@ int operator==( const Address &lhs,const char *rhs) { if (!rhs && !lhs.valid()) return 1; - if (strcmp( (const char *) lhs, rhs)== 0) + if (ACE_OS_String::strcmp( (const char *) lhs, rhs)== 0) return 1; else return 0; @@ -167,7 +169,7 @@ int operator>( const Address &lhs,const char *rhs) { if (!rhs) return lhs.valid(); // if lhs valid then > 0, else invalid !> 0 - if (strcmp( (const char *) lhs, rhs)> 0) + if (ACE_OS_String::strcmp( (const char *) lhs, rhs)> 0) return 1; else return 0; @@ -179,7 +181,7 @@ int operator>=( const Address &lhs,const char *rhs) { if (!rhs) return 1; // always >= 0 - if (strcmp( (const char *) lhs, rhs)>= 0) + if (ACE_OS_String::strcmp( (const char *) lhs, rhs)>= 0) return 1; else return 0; @@ -191,7 +193,7 @@ int operator<( const Address &lhs,const char *rhs) { if (!rhs) return 0; // always >= 0 - if (strcmp( (const char *) lhs, rhs)< 0) + if (ACE_OS_String::strcmp( (const char *) lhs, rhs)< 0) return 1; else return 0; @@ -203,7 +205,7 @@ int operator<=( const Address &lhs,const char *rhs) { if (!rhs) return !lhs.valid(); // invalid == 0, else valid > 0 - if (strcmp( (const char *) lhs, rhs)<= 0) + if (ACE_OS_String::strcmp( (const char *) lhs, rhs)<= 0) return 1; else return 0; @@ -450,7 +452,7 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr) return 0; // look for dot token separator - ip_token = strtok( (char *) temp,"."); + ip_token = ACE_OS_String::strtok( (char *) temp,"."); // while more tokens.. while ( ip_token != 0) { @@ -466,12 +468,12 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr) if (( value > 0)&& ( value <=255)) address_buffer[token_count] = (unsigned char) value; else - if ( strcmp(ip_token,"0")==0) + if (ACE_OS_String::strcmp(ip_token,"0")==0) address_buffer[token_count]= (unsigned char) 0; else error_status = 1; token_count++; - ip_token = strtok( 0, "."); + ip_token = ACE_OS_String::strtok( 0, "."); } // gota be four in len diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp index 2a422a5fe88..b1e9c0e6a3d 100644 --- a/ASNMP/asnmp/octet.cpp +++ b/ASNMP/asnmp/octet.cpp @@ -35,6 +35,7 @@ #include "ace/OS.h" #include "asnmp/octet.h" // include definition for octet class +#include "ace/os_include/ctype.h" ACE_RCSID(asnmp, octet, "$Id$") @@ -587,7 +588,7 @@ char *OctetStr::to_string_hex() #endif // _WIN32 ACE_OS::sprintf(line_ptr, fmt, char_buf); - line_ptr += 3 + strlen(char_buf); + line_ptr += 3 + ACE_OS_String::strlen(char_buf); } return output_buffer; diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp index d0bbcd3c4aa..c0a14b00dc5 100644 --- a/ASNMP/asnmp/oid.cpp +++ b/ASNMP/asnmp/oid.cpp @@ -36,6 +36,7 @@ //---------[ external C libaries used ]-------------------------------- #include "asnmp/oid.h" // include def for oid class +#include "ace/os_include/ctype.h" ACE_RCSID(asnmp, oid, "$Id$") diff --git a/ASNMP/asnmp/vb.cpp b/ASNMP/asnmp/vb.cpp index ff9c22bb773..cbd6ba5290b 100644 --- a/ASNMP/asnmp/vb.cpp +++ b/ASNMP/asnmp/vb.cpp @@ -387,8 +387,8 @@ int operator==( const Vb &lhs, const Vb &rhs) return 0; if (lhs.iv_vb_value_ != 0 && rhs.iv_vb_value_ != 0) { - int val = strcmp(lhs.iv_vb_value_->to_string(), - rhs.iv_vb_value_->to_string()); + int val = ACE_OS_String::strcmp(lhs.iv_vb_value_->to_string(), + rhs.iv_vb_value_->to_string()); return !val; } else diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp index ebbd022d6d4..63c9cf0b34b 100644 --- a/ASNMP/examples/set/set.cpp +++ b/ASNMP/examples/set/set.cpp @@ -72,6 +72,7 @@ int main( int argc, char *argv[]) return 1; } +int set::valid() const { return valid_; diff --git a/ChangeLog b/ChangeLog index 2daa0906290..6c6ba936083 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Fri May 10 13:58:47 UTC 2002 Don Hinton + + * examples/Web_Crawler/URL_Addr.{cpp,h}: + + cpp: Added includes of OS.h and ACE.h. + h: Added include of Default_Constants.h. + + * examples/DLL/Newsweek.cpp: + * examples/DLL/Today.cpp: + + Added include of svc_export.h. + + * ASNMP/asnmp/address.cpp: + * ASNMP/asnmp/octet.cpp: + * ASNMP/asnmp/oid.cpp: + * ASNMP/examples/set/set.cpp: + + Added include of OS_String.h and os_include/ctype.h. Prefaced + some string calls with ACE_OS_String, as needed, and fixed other + minor compile errors. + Fri May 10 12:42:03 UTC 2002 Don Hinton * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 2daa0906290..6c6ba936083 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,24 @@ +Fri May 10 13:58:47 UTC 2002 Don Hinton + + * examples/Web_Crawler/URL_Addr.{cpp,h}: + + cpp: Added includes of OS.h and ACE.h. + h: Added include of Default_Constants.h. + + * examples/DLL/Newsweek.cpp: + * examples/DLL/Today.cpp: + + Added include of svc_export.h. + + * ASNMP/asnmp/address.cpp: + * ASNMP/asnmp/octet.cpp: + * ASNMP/asnmp/oid.cpp: + * ASNMP/examples/set/set.cpp: + + Added include of OS_String.h and os_include/ctype.h. Prefaced + some string calls with ACE_OS_String, as needed, and fixed other + minor compile errors. + Fri May 10 12:42:03 UTC 2002 Don Hinton * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2daa0906290..6c6ba936083 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,24 @@ +Fri May 10 13:58:47 UTC 2002 Don Hinton + + * examples/Web_Crawler/URL_Addr.{cpp,h}: + + cpp: Added includes of OS.h and ACE.h. + h: Added include of Default_Constants.h. + + * examples/DLL/Newsweek.cpp: + * examples/DLL/Today.cpp: + + Added include of svc_export.h. + + * ASNMP/asnmp/address.cpp: + * ASNMP/asnmp/octet.cpp: + * ASNMP/asnmp/oid.cpp: + * ASNMP/examples/set/set.cpp: + + Added include of OS_String.h and os_include/ctype.h. Prefaced + some string calls with ACE_OS_String, as needed, and fixed other + minor compile errors. + Fri May 10 12:42:03 UTC 2002 Don Hinton * examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp: diff --git a/examples/DLL/Newsweek.cpp b/examples/DLL/Newsweek.cpp index a8ef349ec07..cd06013c41a 100644 --- a/examples/DLL/Newsweek.cpp +++ b/examples/DLL/Newsweek.cpp @@ -4,6 +4,7 @@ #include "Newsweek.h" #include "ace/Log_Msg.h" +#include "ace/svc_export.h" // Implementation of the abstract class method which describes // the magazine. diff --git a/examples/DLL/Today.cpp b/examples/DLL/Today.cpp index 39e81489cc8..b5aa75da74c 100644 --- a/examples/DLL/Today.cpp +++ b/examples/DLL/Today.cpp @@ -4,6 +4,7 @@ #include "Today.h" #include "ace/Log_Msg.h" +#include "ace/svc_export.h" // Implementation of the abstract class method which describes the // magazine. diff --git a/examples/Web_Crawler/URL_Addr.cpp b/examples/Web_Crawler/URL_Addr.cpp index 259fb05517e..6b3eb915f3c 100644 --- a/examples/Web_Crawler/URL_Addr.cpp +++ b/examples/Web_Crawler/URL_Addr.cpp @@ -2,6 +2,8 @@ #include "URL_Addr.h" #include "ace/Log_Msg.h" +#include "ace/OS.h" +#include "ace/ACE.h" ACE_RCSID(Web_Crawler, URL_Addr, "$Id$") diff --git a/examples/Web_Crawler/URL_Addr.h b/examples/Web_Crawler/URL_Addr.h index 82961b7e136..f5a6d3fa016 100644 --- a/examples/Web_Crawler/URL_Addr.h +++ b/examples/Web_Crawler/URL_Addr.h @@ -18,6 +18,7 @@ #define ACE_URL_ADDR_H #include "ace/INET_Addr.h" +#include "ace/Default_Constants.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #define ACE_LACKS_PRAGMA_ONCE -- cgit v1.2.1