diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-07-17 16:53:24 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-07-17 16:53:24 +0000 |
| commit | 5c85e2c68451bce45b7ef5fa09aa3b26e668be74 (patch) | |
| tree | 7a9a403048abc9e5c81b8bdff60d93c67d8ecaaa | |
| parent | d9b856a3d0a8f6ac09078fd045fb3e344b25a2d8 (diff) | |
| download | ATCD-5c85e2c68451bce45b7ef5fa09aa3b26e668be74.tar.gz | |
ChangeLogTag:Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | include/makeinclude/platform_hpux_aCC.GNU | 6 | ||||
| -rw-r--r-- | protocols/ace/HTBP/HTBP_ID_Requestor.cpp | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 96e137e925b..fef754cb931 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> + + * include/makeinclude/platform_hpux_aCC.GNU (SOFLAGS): + + Corrected shared library path for Itanium builds. + + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp (get_HTID): + + Use new ACE_CString::size_type type to hold string + position/index value, instead of "int". Addresses "comparison + between signed and unsigned" warnings. + Mon Jul 17 16:04:07 UTC 2006 Chad Elliott <elliott_c@ociweb.com> * NEWS: diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index c615c28c7a8..a32d995bd36 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -165,7 +165,11 @@ ifeq ($(buildbits),32) SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib endif ifeq ($(buildbits),64) -SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 + ifeq ($(itanium),1) + SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/hpux64 + else + SOFLAGS += -Wl,-x -Wl,+h$(@F) -Wl,+b/usr/lib/pa20_64 + endif endif endif diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp index d46b16d0e3b..26fc7fef48b 100644 --- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp +++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp @@ -125,7 +125,7 @@ ACE::HTBP::ID_Requestor::get_HTID () if (result > 0) { ACE_CString answer ((char *)recv_buf.iov_base,recv_buf.iov_len); - ssize_t start = answer.rfind (ACE_TEXT('\n')); + ACE_CString::size_type start = answer.rfind (ACE_TEXT('\n')); if (start == ACE_CString::npos) start = 0; else |