diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-24 20:18:31 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-24 20:18:31 +0000 |
| commit | 43ed243e536168e0613cece145b85b36bc525ecc (patch) | |
| tree | 5b9d99c48804d54a5d76c8e7696378ec388d82c3 | |
| parent | 3a31c419000cc00a7ec20c7f50169b7fe4476d27 (diff) | |
| download | ATCD-43ed243e536168e0613cece145b85b36bc525ecc.tar.gz | |
ChangeLogTag:Fri Nov 24 12:17:59 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/tests/Multiple/Multiple_Impl.cpp | 10 | ||||
| -rw-r--r-- | TAO/tests/Nested_Event_Loop/client.bor | 6 | ||||
| -rw-r--r-- | TAO/tests/Nested_Event_Loop/server.bor | 6 |
4 files changed, 28 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 2b562e0d1c4..ccd20b32b14 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Fri Nov 24 12:17:59 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/Multiple/Multiple_Impl.cpp: + Fix throw specs. + + * tests/Nested_Event_Loop/server.bor: + * tests/Nested_Event_Loop/client.bor: + Add the TAO_Strategies library, it is needed to link these two + programs. + Fri Nov 24 14:07:13 2000 Pradeep Gore <pradeep@cs.wustl.edu> * orbsvcs/orbsvcs/Property/CosPropertyService_i.h: diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index 18d076603d0..478f80666bc 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -20,6 +20,7 @@ Bottom_Impl::~Bottom_Impl (void) } char * Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ACE_TRY_ENV); return CORBA::string_dup(Quote::top); @@ -27,6 +28,7 @@ Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV) char * Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ACE_TRY_ENV); return CORBA::string_dup(Quote::left); @@ -34,6 +36,7 @@ Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV) char * Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ACE_TRY_ENV); return CORBA::string_dup(Quote::right); @@ -41,6 +44,7 @@ Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV) char * Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ACE_TRY_ENV); return CORBA::string_dup(Quote::bottom); @@ -48,6 +52,7 @@ Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV) void Bottom_Impl::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ACE_TRY_ENV); this->orb_->shutdown (0, ACE_TRY_ENV); @@ -70,6 +75,7 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void) char * Delegated_Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <top_quote>\n"))); @@ -82,6 +88,7 @@ Delegated_Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV) char * Delegated_Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <left_quote>\n"))); @@ -94,6 +101,7 @@ Delegated_Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV) char * Delegated_Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <right_quote>\n"))); @@ -106,6 +114,7 @@ Delegated_Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV) char * Delegated_Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <bottom_quote>\n"))); @@ -118,6 +127,7 @@ Delegated_Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV) void Delegated_Bottom_Impl::shutdown (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); diff --git a/TAO/tests/Nested_Event_Loop/client.bor b/TAO/tests/Nested_Event_Loop/client.bor index e889829662c..e134990f904 100644 --- a/TAO/tests/Nested_Event_Loop/client.bor +++ b/TAO/tests/Nested_Event_Loop/client.bor @@ -16,12 +16,14 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ $(TAO_CFLAGS) \ - $(TAO_PORTABLESERVER_CFLAGS) + $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_STRATEGIES_CFLAGS) LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ test.idl diff --git a/TAO/tests/Nested_Event_Loop/server.bor b/TAO/tests/Nested_Event_Loop/server.bor index f9151a61076..0edb30ac993 100644 --- a/TAO/tests/Nested_Event_Loop/server.bor +++ b/TAO/tests/Nested_Event_Loop/server.bor @@ -16,12 +16,14 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ $(TAO_CFLAGS) \ - $(TAO_PORTABLESERVER_CFLAGS) + $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_STRATEGIES_CFLAGS) LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ test.idl |