diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-10 16:01:01 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-10 16:01:01 +0000 |
| commit | 20d18857b0a30f68bcd009b79807806b458d830e (patch) | |
| tree | 63a715cb0ce5840375916487f7ba4b7ce4de076d | |
| parent | afd1150af1a303362b8a989b16c684e7f6209c3c (diff) | |
| download | ATCD-20d18857b0a30f68bcd009b79807806b458d830e.tar.gz | |
ChangeLogTag: Fri Aug 10 10:59:42 2001 Chad Elliott elliott_c@ociweb.com
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tests/Native_Exceptions/test_i.cpp | 5 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Thread_Pool/server.cpp | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b9b440c5d3a..2d2877b2306 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,7 +1,14 @@ +Fri Aug 10 10:59:42 2001 Chad Elliott elliott_c@ociweb.com + + * tests/Native_Exceptions/test_i.cpp: + * tests/RTCORBA/Thread_Pool/server.cpp: + + Changes to avoid warnings on HP-UX with aCC. + Fri Aug 10 08:07:57 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Oneways_Invoking_Twoways/Receiver_i.cpp: Added a debugging - statement. + statement. Thu Aug 9 16:15:03 2001 Balachandran Natarajan <bala@cs.wustl.edu> @@ -21,7 +28,7 @@ Thu Aug 9 11:46:27 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/CDR.h: Fixed the ambigous constructor problem. The InputCDR class had two constructors which were similar if the default values for the arguments were exercised. Thanks to Torbjorn - Backstrom <torbjorn.k.backstrom@volvo.com> for reporting this. + Backstrom <torbjorn.k.backstrom@volvo.com> for reporting this. Wed Aug 8 22:53:37 2001 Balachandran Natarajan <bala@cs.wustl.edu> diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp index 35fb4a4f8e6..ca7ddf1416b 100644 --- a/TAO/tests/Native_Exceptions/test_i.cpp +++ b/TAO/tests/Native_Exceptions/test_i.cpp @@ -16,10 +16,13 @@ Simple_Server_i::test_method (CORBA::Long x) } CORBA::Long -Simple_Server_i::test_raise (CORBA::Long) +Simple_Server_i::test_raise (CORBA::Long x) ACE_THROW_SPEC ((Simple_Server::Failure)) { throw Simple_Server::Failure (); + + // Make HP-UX's aCC happy + return x; } void diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 74a720bfd58..89fe265df5d 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -121,8 +121,11 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; CORBA::ULong stacksize = 0; - RTCORBA::Priority default_priority = - RTCORBA::Priority (ACE_DEFAULT_THREAD_PRIORITY); + // Do this wierd intermediate variable and + // casting to avoid a warning on HP-UX with aCC + CORBA::Long defp = ACE_DEFAULT_THREAD_PRIORITY; + RTCORBA::Priority default_priority = RTCORBA::Priority ( + (CORBA::Short)defp); CORBA::Boolean allow_request_buffering = 0; CORBA::ULong max_buffered_requests = 0; CORBA::ULong max_request_buffer_size = 0; |