diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-22 09:25:08 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-22 09:25:08 +0000 |
| commit | 9787daca61d006484a4a9b5a5e4d39836da387ec (patch) | |
| tree | bfe106f14319133115ab4097312dcc092ea2bd3a | |
| parent | ec4ed7541442fa5895417fca4933c3beab0aff72 (diff) | |
| download | ATCD-9787daca61d006484a4a9b5a5e4d39836da387ec.tar.gz | |
Wed Feb 22 09:24:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/MEM_Addr.h | 3 | ||||
| -rw-r--r-- | ACE/ace/Truncate.h | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 4178d39d7dd..f80f7737e90 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 22 09:24:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Truncate.h (Truncate, truncate_cast): + Also renamed the Borland part + Wed Feb 22 04:57:42 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * tests/NonBlocking_Conn_Test.cpp (test_connect): @@ -147,7 +152,7 @@ Wed Feb 21 19:27:14 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * ace/ACE.inl (hex2byte): * ace/Capabilities.h (is_line, is_empty): * ace/Capabilities.cpp (parse, fillent, is_entry, is_empty, is_line): - * ace/Get_Opt.cpp (long_option): + * ace/Get_Opt.cpp (long_option): * ace/OS_NS_ctype.inl (ace_isalnum): Added ACE::ace_isalnum, ACE::ace_isdigit and ACE::ace_islower @@ -197,7 +202,7 @@ Wed Feb 21 19:27:14 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> Reverted change that altered implementation for IA64 Windows builds. The returned nesting level was incorrect. Use the implementation used by both 32-bit and AMD 64 bit builds. - + * tests/Recursive_Mutex_Test.cpp (test_recursion_depth): Added test cases for the above problem. diff --git a/ACE/ace/MEM_Addr.h b/ACE/ace/MEM_Addr.h index 9f3cd67a05a..687c421443c 100644 --- a/ACE/ace/MEM_Addr.h +++ b/ACE/ace/MEM_Addr.h @@ -68,8 +68,7 @@ public: * otherwise it is assumed to be in network byte order already and * are passed straight through. */ - int set (u_short port_number, - int encode = 1); + int set (u_short port_number, int encode = 1); /// Uses <getservbyname> to initialize an ACE_MEM_Addr from a /// <port_name>, the remote <host_name>, and the <protocol>. diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h index f59bc0dfbed..b6c9d719387 100644 --- a/ACE/ace/Truncate.h +++ b/ACE/ace/Truncate.h @@ -910,7 +910,7 @@ namespace ACE_Utils // ------------------------------------- template<typename TO, typename FROM> - inline TO Truncate (FROM val) + inline TO truncate_cast (FROM val) { typedef Truncator<FROM, TO> truncator; @@ -928,7 +928,7 @@ namespace ACE_Utils { return truncate_cast<TO, FROM> (val); } - + } // namespace ACE_Utils ACE_END_VERSIONED_NAMESPACE_DECL |