diff options
303 files changed, 2036 insertions, 2182 deletions
diff --git a/.gitignore b/.gitignore index 4a0cd8c7d6a..e2d2569b480 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.vcxproj* *.tlog *.log -*.obj +*.obj* *.ilk *.exe *.dll @@ -15,6 +15,7 @@ *S_T.cpp *S_T.h *S_T.inl +*.bmak .depend.* GNUmakefile* @@ -39,4 +40,6 @@ ipch/ *.o *.res *.opendb -*.VC.db +*.VC.db* +*.tds +*.*codeanalysis* diff --git a/ACE/ace/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp index 82e6879bed1..6a44bf58eea 100644 --- a/ACE/ace/Event_Handler.cpp +++ b/ACE/ace/Event_Handler.cpp @@ -16,7 +16,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Implement conceptually abstract virtual functions in the base class // so derived classes don't have to implement unused ones. - ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r, int p) : reference_count_ (1), @@ -33,7 +32,6 @@ ACE_Event_Handler::~ACE_Event_Handler (void) } // Gets the file descriptor associated with this I/O device. - ACE_HANDLE ACE_Event_Handler::get_handle (void) const { @@ -42,7 +40,6 @@ ACE_Event_Handler::get_handle (void) const } // Sets the file descriptor associated with this I/O device. - void ACE_Event_Handler::set_handle (ACE_HANDLE) { @@ -50,7 +47,6 @@ ACE_Event_Handler::set_handle (ACE_HANDLE) } // Gets the priority of this handler. - int ACE_Event_Handler::priority (void) const { @@ -59,7 +55,6 @@ ACE_Event_Handler::priority (void) const } // Sets the priority - void ACE_Event_Handler::priority (int priority) { @@ -69,7 +64,6 @@ ACE_Event_Handler::priority (int priority) // Called when the object is about to be removed from the Dispatcher // tables. - int ACE_Event_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { @@ -78,7 +72,6 @@ ACE_Event_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) } // Called when input becomes available on fd. - int ACE_Event_Handler::handle_input (ACE_HANDLE) { @@ -87,7 +80,6 @@ ACE_Event_Handler::handle_input (ACE_HANDLE) } // Called when output is possible on fd. - int ACE_Event_Handler::handle_output (ACE_HANDLE) { @@ -96,7 +88,6 @@ ACE_Event_Handler::handle_output (ACE_HANDLE) } // Called when urgent data is available on fd. - int ACE_Event_Handler::handle_exception (ACE_HANDLE) { @@ -105,7 +96,6 @@ ACE_Event_Handler::handle_exception (ACE_HANDLE) } // Called when timer expires, TV stores the current time. - int ACE_Event_Handler::handle_timeout (const ACE_Time_Value &, const void *) { @@ -114,7 +104,6 @@ ACE_Event_Handler::handle_timeout (const ACE_Time_Value &, const void *) } // Called when a monitored Process exits - int ACE_Event_Handler::handle_exit (ACE_Process *) { @@ -123,7 +112,6 @@ ACE_Event_Handler::handle_exit (ACE_Process *) } // Called when a registered signal occurs. - int ACE_Event_Handler::handle_signal (int, siginfo_t *, ucontext_t *) { @@ -141,7 +129,6 @@ ACE_Event_Handler::resume_handler (void) return ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER; } - int ACE_Event_Handler::handle_qos (ACE_HANDLE) { diff --git a/ACE/ace/Log_Category.cpp b/ACE/ace/Log_Category.cpp index f26e0be891c..98a2cc8585a 100644 --- a/ACE/ace/Log_Category.cpp +++ b/ACE/ace/Log_Category.cpp @@ -3,12 +3,10 @@ #include "ace/Atomic_Op.h" #include "ace/OS_NS_Thread.h" - #if !defined (__ACE_INLINE__) #include "ace/Log_Category.inl" #endif /* __ACE_INLINE__ */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_HAS_THREADS) @@ -19,7 +17,6 @@ ACE_Log_Category_tss_destroy(void * p) } #endif // defined (ACE_HAS_THREADS) - ACE_Log_Category::ACE_Log_Category(const char* name) : name_(name) , id_(0) @@ -125,8 +122,6 @@ ACE_Log_Category::per_thr_obj() #endif // defined (ACE_HAS_THREADS) } - - ACE_Log_Category& ACE_Log_Category::ace_lib() { diff --git a/ACE/ace/Log_Category.h b/ACE/ace/Log_Category.h index 2f6c0c226be..a7f11a36078 100644 --- a/ACE/ace/Log_Category.h +++ b/ACE/ace/Log_Category.h @@ -282,7 +282,6 @@ public: /// Set the process ACE_Log_Priority mask, returns original mask. u_long priority_mask (u_long); - static ACE_Log_Category& ace_lib(); private: @@ -309,7 +308,6 @@ private: #endif // defined (ACE_HAS_THREADS) }; - ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index ee83bbcae25..aa2e354b068 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -770,7 +770,6 @@ ACE_Log_Msg::cleanup_ostream () } // Open the sender-side of the message queue. - int ACE_Log_Msg::open (const ACE_TCHAR *prog_name, u_long flags, diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 92c54cecbca..658da70e24b 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -411,7 +411,6 @@ public: * @note Be aware that because of the current architecture there is * no guarantee that open (), reset () and close () will be called * on a backend object. - * */ static ACE_Log_Msg_Backend *msg_backend (ACE_Log_Msg_Backend *b); static ACE_Log_Msg_Backend *msg_backend (void); @@ -767,7 +766,6 @@ private: ACE_Log_Msg (const ACE_Log_Msg &); }; - #ifdef ACE_LACKS_VA_FUNCTIONS class ACE_Time_Value; /// Alternative to varargs for formatting log messages. diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index 792384b9a73..0ace47d7fc9 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -69,7 +69,6 @@ public: /// Default dtor. ~ACE_Log_Record (void); - /// Write the contents of the logging record to the appropriate /// FILE if the corresponding type is enabled. int print (const ACE_TCHAR host_name[], diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index f50b5584c68..e5d30024f14 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -53,7 +53,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Process_Manager) // Singleton instance. ACE_Process_Manager *ACE_Process_Manager::instance_ = 0; -// Controls whether the <Process_Manager> is deleted when we shut down +// Controls whether the Process_Manager is deleted when we shut down // (we can only delete it safely if we created it!) bool ACE_Process_Manager::delete_instance_ = false; @@ -219,7 +219,6 @@ ACE_Process_Manager::resize (size_t size) } // Create and initialize the table to keep track of the process pool. - int ACE_Process_Manager::open (size_t size, ACE_Reactor *r) { @@ -243,7 +242,6 @@ ACE_Process_Manager::open (size_t size, ACE_Reactor *r) } // Initialize the synchronization variables. - ACE_Process_Manager::ACE_Process_Manager (size_t size, ACE_Reactor *r) : ACE_Event_Handler (), @@ -266,7 +264,6 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size, } // Close up and release all resources. - int ACE_Process_Manager::close (void) { @@ -313,7 +310,6 @@ ACE_Process_Manager::~ACE_Process_Manager (void) // routine, which fooled the Reactor into thinking that this routine // needed to be called. Since we don't know which Process exited, we // must reap as many exit statuses as are immediately available. - int ACE_Process_Manager::handle_input (ACE_HANDLE) { @@ -322,8 +318,7 @@ ACE_Process_Manager::handle_input (ACE_HANDLE) pid_t pid; do - pid = this->wait (0, - ACE_Time_Value::zero); + pid = this->wait (0, ACE_Time_Value::zero); while (pid != 0 && pid != ACE_INVALID_PID); return 0; @@ -351,7 +346,6 @@ ACE_Process_Manager::handle_close (ACE_HANDLE /* handle */, // // On Win32, this routine is called synchronously, and is passed the // HANDLE of the Process that exited, so we can do all our work here. - int ACE_Process_Manager::handle_signal (int, siginfo_t *si, @@ -431,7 +425,6 @@ ACE_Process_Manager::register_handler (ACE_Event_Handler *eh, } // Create a new process. - pid_t ACE_Process_Manager::spawn (ACE_Process_Options &options, ACE_Event_Handler *event_handler) @@ -449,7 +442,6 @@ ACE_Process_Manager::spawn (ACE_Process_Options &options, } // Create a new process. - pid_t ACE_Process_Manager::spawn (ACE_Process *process, ACE_Process_Options &options, @@ -474,7 +466,6 @@ ACE_Process_Manager::spawn (ACE_Process *process, } // Create N new processs. - int ACE_Process_Manager::spawn_n (size_t n, ACE_Process_Options &options, @@ -506,7 +497,6 @@ ACE_Process_Manager::spawn_n (size_t n, // Append a process into the pool (does not check for duplicates). // Must be called with locks held. - int ACE_Process_Manager::append_proc (ACE_Process *proc, ACE_Event_Handler *event_handler) @@ -545,7 +535,6 @@ ACE_Process_Manager::append_proc (ACE_Process *proc, // Insert a process into the pool (checks for duplicates and doesn't // allow them to be inserted twice). - int ACE_Process_Manager::insert_proc (ACE_Process *proc, ACE_Event_Handler *event_handler) @@ -561,7 +550,6 @@ ACE_Process_Manager::insert_proc (ACE_Process *proc, } // Remove a process from the pool. - int ACE_Process_Manager::remove (pid_t pid) { @@ -579,7 +567,6 @@ ACE_Process_Manager::remove (pid_t pid) } // Remove a process from the pool. Must be called with locks held. - int ACE_Process_Manager::remove_proc (size_t i) { @@ -654,7 +641,6 @@ ACE_Process_Manager::terminate (pid_t pid, int sig) return ACE_OS::kill (pid, sig); } - int ACE_Process_Manager::set_scheduler (const ACE_Sched_Params & params, pid_t pid) @@ -694,7 +680,6 @@ ACE_Process_Manager::set_scheduler_all (const ACE_Sched_Params & params) // Locate the index in the table associated with <pid>. Must be // called with the lock held. - ssize_t ACE_Process_Manager::find_proc (pid_t pid) { @@ -714,7 +699,6 @@ ACE_Process_Manager::find_proc (pid_t pid) #if defined (ACE_WIN32) // Locate the index in the table associated with <h>. Must be // called with the lock held. - ssize_t ACE_Process_Manager::find_proc (ACE_HANDLE h) { @@ -732,9 +716,8 @@ ACE_Process_Manager::find_proc (ACE_HANDLE h) } #endif /* ACE_WIN32 */ -// Wait for all the Processs to exit, or until <timeout> elapses. +// Wait for all the Processs to exit, or until @a timeout elapses. // Returns the number of Processes remaining, or -1 on an error. - int ACE_Process_Manager::wait (const ACE_Time_Value &timeout) { @@ -773,7 +756,6 @@ ACE_Process_Manager::wait (const ACE_Time_Value &timeout) // near as possible -- on Unix, we might accidentally get some other // Process_Manager's Process, or an unmanaged Process, or a child // process started by some other means. - pid_t ACE_Process_Manager::wait (pid_t pid, ACE_exitcode *status) @@ -785,10 +767,9 @@ ACE_Process_Manager::wait (pid_t pid, status); } -// Collect a single child processes' exit status, unless <timeout> +// Collect a single child processes' exit status, unless @a timeout // elapses before the process exits. Same caveats about accidental // Process reaping on Unix as above. - pid_t ACE_Process_Manager::wait (pid_t pid, const ACE_Time_Value &timeout, @@ -985,7 +966,6 @@ ACE_Process_Manager::wait (pid_t pid, // Notify either the process-specific handler or the generic handler. // If process-specific, call handle_close on the handler. Returns 1 // if process found, 0 if not. Must be called with locks held. - int ACE_Process_Manager::notify_proc_handler (size_t i, ACE_exitcode exit_code) @@ -1002,9 +982,7 @@ ACE_Process_Manager::notify_proc_handler (size_t i, else if (this->default_exit_handler_ != 0 && this->default_exit_handler_->handle_exit (proc_desc.process_) < 0) { - this->default_exit_handler_->handle_close - (ACE_INVALID_HANDLE, - 0); + this->default_exit_handler_->handle_close (ACE_INVALID_HANDLE, 0); this->default_exit_handler_ = 0; } return 1; diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h index 3c39e92f792..81fac580ef7 100644 --- a/ACE/ace/Signal.h +++ b/ACE/ace/Signal.h @@ -153,8 +153,12 @@ public: sigset_t *sigmask = 0, int flags = 0); - /// Copy constructor. - ACE_Sig_Action (const ACE_Sig_Action &s); +#if defined (ACE_HAS_CPP11) + ACE_Sig_Action (const ACE_Sig_Action&) = default; + ACE_Sig_Action (ACE_Sig_Action&&) = default; + ACE_Sig_Action& operator = (ACE_Sig_Action const &) = default; + ACE_Sig_Action &operator = (ACE_Sig_Action&&) = default; +#endif /* ACE_HAS_CPP11 */ /// Default dtor. ~ACE_Sig_Action (void); diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl index ff2f52403ec..64ac6c049e5 100644 --- a/ACE/ace/Signal.inl +++ b/ACE/ace/Signal.inl @@ -168,14 +168,6 @@ ACE_Sig_Action::operator struct sigaction * () return &this->sa_; } -ACE_INLINE -ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Action &s) - // : sa_ () -{ - ACE_TRACE ("ACE_Sig_Action::ACE_Sig_Action"); - *this = s; // structure copy. -} - ACE_INLINE int ACE_Sig_Action::register_action (int signum, ACE_Sig_Action *oaction) { diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h index 01bef136414..29ffa7d4ab6 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -116,8 +116,12 @@ public: /// Set delegate void set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate); - /// Copy policy - ACE_Delegating_Time_Policy& operator =(ACE_Delegating_Time_Policy const & pol); +#if defined (ACE_HAS_CPP11) + ACE_Delegating_Time_Policy (const ACE_Delegating_Time_Policy&) = default; + ACE_Delegating_Time_Policy (ACE_Delegating_Time_Policy&&) = default; + ACE_Delegating_Time_Policy& operator = (ACE_Delegating_Time_Policy const &) = default; + ACE_Delegating_Time_Policy &operator = (ACE_Delegating_Time_Policy&&) = default; +#endif /* ACE_HAS_CPP11 */ /// Noop. Just here to satisfy backwards compatibility demands. void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl index 59650b8e159..8ecea822490 100644 --- a/ACE/ace/Time_Policy.inl +++ b/ACE/ace/Time_Policy.inl @@ -82,11 +82,4 @@ ACE_Delegating_Time_Policy::set_delegate (ACE_Dynamic_Time_Policy_Base const * d } } -ACE_INLINE ACE_Delegating_Time_Policy& -ACE_Delegating_Time_Policy::operator =(ACE_Delegating_Time_Policy const & pol) -{ - this->delegate_ = pol.delegate_; - return *this; -} - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index 7b67867ee23..3e51853ecba 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -84,6 +84,9 @@ public: explicit ACE_Time_Value (const timespec_t &t); #if defined (ACE_HAS_CPP11) + ACE_Time_Value (const ACE_Time_Value&) = default; + ACE_Time_Value (ACE_Time_Value&&) = default; + /// Construct the ACE_Time_Value object from a chrono duration. template< class Rep, class Period > explicit ACE_Time_Value (const std::chrono::duration<Rep, Period>& duration) @@ -264,8 +267,11 @@ public: /// Add @a tv to this. ACE_Time_Value &operator += (time_t tv); +#if defined (ACE_HAS_CPP11) /// Assign @a tv to this - ACE_Time_Value &operator = (const ACE_Time_Value &tv); + ACE_Time_Value &operator = (const ACE_Time_Value &) = default; + ACE_Time_Value &operator = (ACE_Time_Value &&) = default; +#endif /* ACE_HAS_CPP11 */ /// Assign @a tv to this ACE_Time_Value &operator = (time_t tv); diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index 98459b47713..581e348657b 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -344,15 +344,6 @@ ACE_Time_Value::operator+= (time_t tv) } ACE_INLINE ACE_Time_Value & -ACE_Time_Value::operator= (const ACE_Time_Value &tv) -{ - // ACE_OS_TRACE ("ACE_Time_Value::operator="); - this->sec (tv.sec ()); - this->usec (tv.usec ()); - return *this; -} - -ACE_INLINE ACE_Time_Value & ACE_Time_Value::operator= (time_t tv) { // ACE_OS_TRACE ("ACE_Time_Value::operator="); diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index c00cab2da08..92ad6c02dc0 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -771,6 +771,8 @@ __postbuild__: $(VBIN) $(INSTALL) <%else%> <%if(sharedname || staticname)%> __postbuild__: $(VLIBS) $(INSTALL) +<%else%> +__postbuild__: $(GENERATED_DIRTY) <%endif%> <%endif%> diff --git a/ACE/tests/Log_Msg_Backend_Test.cpp b/ACE/tests/Log_Msg_Backend_Test.cpp index 1f9ec350bf9..d4579da6044 100644 --- a/ACE/tests/Log_Msg_Backend_Test.cpp +++ b/ACE/tests/Log_Msg_Backend_Test.cpp @@ -11,15 +11,12 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Log_Msg.h" #include "ace/Log_Msg_Backend.h" #include "ace/Log_Record.h" - - class Backend : public ACE_Log_Msg_Backend { public: diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index f069c1a9056..bae36ea9c0e 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -19,7 +19,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" @@ -36,8 +35,6 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/OS_NS_unistd.h" - - #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT static const char message[] = "abcdefghijklmnopqrstuvwxyz"; @@ -1313,8 +1310,7 @@ test<REACTOR_IMPL>::test (int ignore_nested_upcalls, if (!test_configs[i][1] && require_event_loop_thread) continue; - ACE_Reactor reactor (new REACTOR_IMPL, - 1); + ACE_Reactor reactor (new REACTOR_IMPL, true); testing (&reactor, test_configs[i][0], diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 1c13e36df59..d08152588d6 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -17,7 +17,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/SString.h" #include "ace/Atomic_Op.h" @@ -30,8 +29,6 @@ #include "ace/Thread.h" #include "ace/Reactor.h" - - static u_int debug_test = 0; #if defined (ACE_HAS_WIN32_PRIORITY_CLASS) static u_int process_id = 0; @@ -361,7 +358,6 @@ run_main (int argc, ACE_TCHAR *argv[]) test_status = result; // Try the explicit <ACE_Process_Manager::wait> functions - ACE_Process_Manager mgr; mgr.register_handler (new Exit_Handler ("default")); diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp index 2796ac8ee6a..fe06d7813a9 100644 --- a/ACE/tests/Reactor_Exceptions_Test.cpp +++ b/ACE/tests/Reactor_Exceptions_Test.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Reactor_Exceptions_Test.cpp diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index 30f4b9cc41b..b48f2a8849c 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Timer_Cancellation_Test.cpp @@ -9,15 +8,12 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_unistd.h" #include "ace/Reactor.h" #include "ace/TP_Reactor.h" #include "ace/Task.h" - - #if defined (ACE_HAS_THREADS) class Deadlock : public ACE_Task_Base @@ -116,8 +112,7 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Timer_Cancellation_Test")); - ACE_Reactor reactor (new ACE_TP_Reactor, - 1); + ACE_Reactor reactor (new ACE_TP_Reactor, true); Deadlock deadlock; deadlock.reactor (&reactor); diff --git a/ACE/tests/WFMO_Reactor_Test.cpp b/ACE/tests/WFMO_Reactor_Test.cpp index 9e86f577607..ee85fa70acb 100644 --- a/ACE/tests/WFMO_Reactor_Test.cpp +++ b/ACE/tests/WFMO_Reactor_Test.cpp @@ -10,14 +10,11 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Reactor.h" #include "ace/WFMO_Reactor.h" #include "ace/Pipe.h" - - #if defined (ACE_WIN32) static int number_of_handlers = 6; @@ -26,13 +23,11 @@ static int number_of_closes = 0; class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_Reactor &reactor); ~Event_Handler (void); ACE_Pipe pipe_; - }; Event_Handler::Event_Handler (ACE_Reactor &reactor) @@ -78,7 +73,7 @@ test (void) int result = 0; int i = 0; - ACE_Reactor reactor (new ACE_WFMO_Reactor, 1); + ACE_Reactor reactor (new ACE_WFMO_Reactor, true); ACE_Event_Handler_var *safe_event_handlers = new ACE_Event_Handler_var[number_of_handlers]; diff --git a/TAO/MPC/config/security.mpb b/TAO/MPC/config/security.mpb index f46210cc5ac..3cec6a9cb93 100644 --- a/TAO/MPC/config/security.mpb +++ b/TAO/MPC/config/security.mpb @@ -1,5 +1,5 @@ // -*- MPC -*- -project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi { +project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib, pi, svc_utils { after += Security libs += TAO_Security tagchecks += Security @@ -1,6 +1,8 @@ USER VISIBLE CHANGES BETWEEN TAO-2.5.5 and TAO-2.5.6 ==================================================== +. Fixed race condition in ImplRepo on server shutdown/restart (#889) + USER VISIBLE CHANGES BETWEEN TAO-2.5.4 and TAO-2.5.5 ==================================================== diff --git a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp index 5ccaba059f2..45eab38d7d6 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp @@ -46,6 +46,7 @@ IMPL_NARROW_FROM_SCOPE (AST_Annotation_Decl) void AST_Annotation_Decl::escape_name (Identifier *name) { + FE_Utils::original_local_name (name); // Annotations can't clash with C++ keywords char *old_name = name->get_string (); char *new_name = new char [ACE_OS::strlen (old_name) + 2]; // '@' and '\0' if (new_name) diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index e62a79fdf33..81411d16f63 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -1603,8 +1603,8 @@ void AST_Decl::dump_annotations (ACE_OSTREAM_TYPE &o, bool print_inline) { AST_Annotation_Appls::iterator - i = annotation_appls_->begin (), - finished = annotation_appls_->end (); + i = annotation_appls ().begin (), + finished = annotation_appls ().end (); for (; i != finished; ++i) { AST_Annotation_Appl* a = i->get (); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index f0d794a7af0..62be2400733 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -96,34 +96,33 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) be_util::gen_nested_namespace_begin (os, module); - // Generate the Any <<= and >>= operator declarations // Any <<= and >>= operators. *os << "void operator<<= (" << be_idt << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "::" << node->name () << " _tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << "::" << node->name () << " _tao_elem)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Basic_Impl_T< ::" << node->name () << ">::insert (" << be_idt << be_idt_nl << "_tao_any," << be_nl << "::" << node->tc_name () << "," << be_nl - << "_tao_elem" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "_tao_elem);" << be_uidt + << be_uidt << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "::" << node->name () << " &_tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << "::" << node->name () << " &_tao_elem)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::Any_Basic_Impl_T< ::" << node->name () << ">::extract (" << be_idt << be_idt_nl << "_tao_any," << be_nl << "::" << node->tc_name () << "," << be_nl - << "_tao_elem " << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem);" << be_uidt + << be_uidt << be_uidt << be_uidt_nl << "}"; be_util::gen_nested_namespace_end (os, module); @@ -140,29 +139,29 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) // Any <<= and >>= operators. *os << "void operator<<= (" << be_idt << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->name () << " _tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << node->name () << " _tao_elem)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Basic_Impl_T<" << node->name () << ">::insert (" << be_idt << be_idt_nl << "_tao_any," << be_nl << node->tc_name () << "," << be_nl - << "_tao_elem" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl + << "_tao_elem);" << be_uidt + << be_uidt << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << node->name () << " &_tao_elem" << be_uidt_nl - << ")" << be_uidt_nl + << node->name () << " &_tao_elem)" << be_uidt + << be_uidt_nl << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::Any_Basic_Impl_T<" << node->name () << ">::extract (" << be_idt << be_idt_nl << "_tao_any," << be_nl << node->tc_name () << "," << be_nl - << "_tao_elem " << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem);" << be_uidt + << be_uidt << be_uidt << be_uidt_nl << "}"; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index f6349ef0183..3f6ef5dea96 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -135,51 +135,50 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << be_nl_2 << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " &_tao_elem)" << be_uidt + << "const ::" << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion operator." *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "::" << node->name () << " *_tao_elem)" << be_uidt + << "::" << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer operator. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " *&_tao_elem)" << be_uidt + << "const ::" << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; be_util::gen_nested_namespace_end (os, module); @@ -197,51 +196,50 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << be_nl_2 << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << " &_tao_elem)" << be_uidt + << "const " << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion operator." *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->name () << " *_tao_elem)" << be_uidt + << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer operator. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << " *&_tao_elem)" << be_uidt + << "const " << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index 884bae78ca8..c0e0427d1ba 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -213,11 +213,9 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) << node->name () << "::_tao_duplicate (void) const" << be_nl << "{" << be_idt_nl << "::CORBA::Exception *result = 0;" << be_nl - << "ACE_NEW_RETURN (" << be_idt << be_idt_nl - << "result," << be_nl - << "::" << node->name () << " (*this)," << be_nl - << "0);" << be_uidt - << be_uidt_nl + << "ACE_NEW_RETURN (result, " + << "::" << node->name () << " (*this), 0);" + << be_nl << "return result;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index a18f15af4e3..6cb026e9f28 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -145,9 +145,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << be_nl_2 << "/// Copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->local_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl + << node->local_name () << "_ptr _tao_elem)" << be_uidt_nl << "{" << be_idt_nl << node->local_name () << "_ptr _tao_objptr =" << be_idt_nl << node->local_name () << "::_duplicate (_tao_elem);" << be_uidt_nl @@ -156,17 +156,17 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << "/// Non-copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->local_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl + << node->local_name () << "_ptr *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Impl_T<" << node->local_name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->local_name () << "::_tao_any_destructor," << be_nl << node->tc_name ()->last_component () << "," << be_nl << "*_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean" << be_nl @@ -197,9 +197,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << be_nl_2 << "/// Copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->full_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl + << node->full_name () << "_ptr _tao_elem)" << be_uidt_nl << "{" << be_idt_nl << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl @@ -208,17 +208,17 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << "/// Non-copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->full_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl + << node->full_name () << "_ptr *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Impl_T<" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "*_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index 19a31e62858..58f86811c6e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -85,9 +85,9 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << tiename << " (" << be_idt << be_idt_nl << "T *tp," << be_nl << "PortableServer::POA_ptr poa," << be_nl - << "::CORBA::Boolean release = true" << be_uidt_nl - << ");" << be_uidt_nl - << "/// dtor" << be_nl_2 + << "::CORBA::Boolean release = true);" << be_uidt + << be_uidt_nl + << "/// dtor" << be_nl << "~" << tiename << " (void);" << be_nl << "// TIE specific functions" << be_nl << "/// return the underlying object" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index f716abff8aa..ff3efd24709 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -215,52 +215,50 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Copying insertion. *os << be_nl << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " &_tao_elem)" << be_uidt + << "const ::" << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion. *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "::" << node->name () << " *_tao_elem)" << be_uidt + << "::" << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " *&_tao_elem)" << be_uidt + << "const ::" << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; be_util::gen_nested_namespace_end (os, module); @@ -276,52 +274,50 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Copying insertion. *os << be_nl << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << " &_tao_elem)" << be_uidt + << "const " << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion. *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->name () << " *_tao_elem)" << be_uidt + << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << " *&_tao_elem)" << be_uidt + << "const " << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index b38017bb788..b938d981a43 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -107,52 +107,50 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) // Copying insertion. *os << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " &_tao_elem)" << be_uidt + << "const ::" << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl - << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem);" + << be_uidt << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion. *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl - << "::CORBA::Any &_tao_any, ::" << be_nl - << node->name () << " *_tao_elem)" << be_uidt + << "void operator<<= (" << be_idt_nl + << "::CORBA::Any &_tao_any," << be_nl + << "::" << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " *&_tao_elem)" << be_uidt + << "const ::" << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; be_util::gen_nested_namespace_end (os, module); @@ -172,14 +170,13 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << "const " << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" - << be_uidt << be_uidt << be_uidt_nl + << be_uidt << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion. @@ -205,14 +202,13 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << "const " << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" + << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" - << be_uidt << be_uidt << be_uidt_nl + << be_uidt << be_uidt_nl << "}"; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index 439433b180e..ed636e42cac 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -103,52 +103,50 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) // Copying insertion. *os << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " &_tao_elem)" << be_uidt + << "const ::" << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl - << "_tao_elem" << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl + << "_tao_elem);" + << be_uidt << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion. *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "::" << node->name () << " *_tao_elem)" << be_uidt + << "::" << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const ::" << node->name () << " *&_tao_elem)" << be_uidt + << "const ::" << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << "::" << node->name () << "::_tao_any_destructor," << be_nl << "::" << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; be_util::gen_nested_namespace_end (os, module); @@ -163,52 +161,50 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) // Copying insertion. *os << "/// Copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << " &_tao_elem)" << be_uidt + << "const " << node->name () << " &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Non-copying insertion. *os << "/// Non-copying insertion." << be_nl - << "void operator<<= (" << be_idt << be_idt_nl + << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->name () << " *_tao_elem)" << be_uidt + << node->name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; // Extraction to const pointer. *os << "/// Extraction to const pointer." << be_nl - << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl + << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl - << "const " << node->name () << " *&_tao_elem)" << be_uidt + << "const " << node->name () << " *&_tao_elem)" << be_uidt_nl << "{" << be_idt_nl - << "return" << be_idt_nl - << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" - << be_idt << be_idt_nl + << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract (" + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "_tao_elem);" << be_uidt - << be_uidt << be_uidt << be_uidt_nl + << be_uidt_nl << "}"; *os << be_global->core_versioning_end () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index 63cacd50699..ce748c930f4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -92,9 +92,9 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) // emit nested variation of any operators *os << "/// Copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->local_name () << " *_tao_elem)" << be_uidt << be_uidt_nl + << node->local_name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "::CORBA::add_ref (_tao_elem);" << be_nl << "_tao_any <<= &_tao_elem;" << be_uidt_nl @@ -102,16 +102,16 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "/// Non-copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->local_name () << " **_tao_elem)" << be_uidt << be_uidt_nl + << node->local_name () << " **_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Impl_T<" << node->local_name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->local_name () << "::_tao_any_destructor," << be_nl << node->tc_name ()->last_component () << "," << be_nl - << "*_tao_elem);" << be_uidt << be_uidt << be_uidt_nl + << "*_tao_elem);" << be_uidt << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean" << be_nl @@ -141,9 +141,9 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "/// Copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->full_name () << " *_tao_elem)" << be_uidt + << node->full_name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "::CORBA::add_ref (_tao_elem);" << be_nl @@ -152,18 +152,18 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "/// Non-copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->full_name () << " **_tao_elem)" << be_uidt + << node->full_name () << " **_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Impl_T<" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "*_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index d1b6dd6e6e8..dfb80cfc402 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -91,9 +91,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) // emit nested variation of any operators *os << "/// Copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->local_name () << " *_tao_elem)" << be_uidt + << node->local_name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl @@ -110,18 +110,18 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "/// Non-copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->local_name () << " **_tao_elem)" << be_uidt + << node->local_name () << " **_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Impl_T<" << node->local_name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->local_name () << "::_tao_any_destructor," << be_nl << node->tc_name ()->last_component () << "," << be_nl << "*_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean" << be_nl @@ -151,9 +151,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "/// Copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->full_name () << " *_tao_elem)" << be_uidt + << node->full_name () << " *_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl @@ -170,18 +170,18 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "/// Non-copying insertion." << be_nl << "void" << be_nl - << "operator<<= (" << be_idt << be_idt_nl + << "operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl - << node->full_name () << " **_tao_elem)" << be_uidt + << node->full_name () << " **_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::Any_Impl_T<" << node->name () << ">::insert (" - << be_idt << be_idt_nl + << be_idt_nl << "_tao_any," << be_nl << node->name () << "::_tao_any_destructor," << be_nl << node->tc_name () << "," << be_nl << "*_tao_elem);" << be_uidt - << be_uidt << be_uidt_nl + << be_uidt_nl << "}" << be_nl_2; *os << "::CORBA::Boolean" << be_nl diff --git a/TAO/TAO_IDL/docs/annotations.md b/TAO/TAO_IDL/docs/annotations.md index c575d472cd2..052c5aabc50 100644 --- a/TAO/TAO_IDL/docs/annotations.md +++ b/TAO/TAO_IDL/docs/annotations.md @@ -7,7 +7,7 @@ compiler that uses `tao_idl`.** * [IDL Annotations](#idl-annotations) * [Special Cases of Annotations](#special-cases-of-annotations) - * [Unions Discriminators](#unions-discriminators) + * [Union Discriminators](#union-discriminators) * [Base Types in Sequences](#base-types-in-sequences) * [Base Types in Arrays](#base-types-in-arrays) * [Defining Annotations](#defining-annotations) @@ -17,7 +17,7 @@ compiler that uses `tao_idl`.** * [Reading `@document` Annotations](#reading-document-annotations) * [Reading Annotations Manually](#reading-annotations-manually) * [Reading Special Cases of Annotations](#reading-special-cases-of-annotations) - * [Unions Discriminators](#unions-discriminators-1) + * [Union Discriminators](#union-discriminators-1) * [Base Types in Sequences](#base-types-in-sequences-1) * [Base Types in Arrays](#base-types-in-arrays-1) * [Limitations](#limitations) @@ -65,7 +65,7 @@ struct Report { unsigned long index; @optional - Expiration_t expiration; + Time_t expiration; @optional Urgency_t urgency; @@ -85,17 +85,17 @@ applied in the following cases. See ["Reading Special Cases of Annotations"](#reading-special-cases-of-annotations) for how to have the compiler use these kinds of annotations. -#### Unions Discriminators +#### Union Discriminators -**[See Compiler Example](#unions-discriminators-1)** +**[See Compiler Example](#union-discriminators-1)** ``` -enum GradeType { +enum GradingSystem_t { PASS_FAIL, PASS_70, PASS_80 }; -union Grade (@key GradeType) { +union Grade_t switch (@key GradingSystem_t) { case PASS_FAIL: boolean pass; case PASS_70: @@ -140,9 +140,9 @@ annotation notation. ### `@document` Example -As a simple example, If we wanted to make a annotation that inserted comments +As a simple example, if we wanted to make an annotation that inserted comments into the product files for documentation purposes, we could design an -annotation like this this: +annotation like this: ``` @annotation document { @@ -277,7 +277,7 @@ so it will be ignored. To make the program aware of the annotations, see ### What Can Go in Annotations -- Annotations members can be of any type that constants can be. This includes +- Annotation members can be of any type that constants can be. This includes booleans, integers, floats, enumerations, characters, and strings. - Enumerations, constants, and typedefs can be declared inside the annotation declaration, however they can not used outside the annotation expect for when @@ -289,9 +289,12 @@ inside it. To get the annotations for most nodes types, use `node->annotations ().find (annotation_decl)` where `annotation_decl` can be the -annotation declaration or its canonical name. This will return the last -`AST_Annotation_Appl*` of that type on the node or `NULL` if there no -annotation of that type. +`AST_Annotation_Decl` object or its canonical internal TAO IDL name (see next +paragraph). This will return the last `AST_Annotation_Appl*` of that type on +the node or `NULL` if there no annotation of that type. Because +`AST_Annotation_Appls::find` can take a `AST_Annotation_Decl`, they can be looked +up after `idl_eval` creates them and cached for a slightly faster +`find`. Internally, annotation local names are prefixed with `@` to prevent clashes with other elements in IDL with the same name. For example when trying to use @@ -304,11 +307,14 @@ the root module. In IDL, this annotation's full name would be `@foo::bar`or After that check, you can use index operators `[const char*]` on the annotation to get the individual members and `value()` to get the value. -The last part is not straightforward, as the value is a `AST_Expression` object +The last part is not straightforward, as the value is an `AST_Expression` object and `AST_Expression` is a complex class that handles constant values in TAO\_IDL. There are examples below but see `AST_Expression::AST_ExprValue` for how values can be accessed. +See `include/ast_expression.h` and `ast/ast_expression.cpp` for how +to use `AST_Expression`. + ### Reading `@document` Annotations In this example we will use the [`@document` annotation defined @@ -349,7 +355,7 @@ these lines would also need to be added: /* * This is more complicated because we are trying to get the name of * the enumerator. If we just wanted the number value, we could treat the - * AST_Expresssion from the annotation member as a unsigned long by using + * AST_Expresssion from the annotation member as an unsigned long by using * ev ()->u.ulval. */ const char *api_type = 0; @@ -460,16 +466,17 @@ Annotations placed before a definition in a scope are interpreted as annotating the node that is being defined. Annotations in other places require special grammar and special handling in the API. -The following cases shows how to get the last annotation called `anno` from +The following cases show how to get the last annotation called `anno` from these special cases. -If a type is `typedef`-ed, resolve it completely using `AST_Type -*primitive_base_type ()` and `dynamic_cast` to the correct type before trying -to read these special cases. +To access these methods on a type that has been "`typedef`-ed", it must be +resolved completely using `AST_Type *primitive_base_type ()` and a +`dynamic_cast` to the correct type as these methods are specific to these +classes. -#### Unions Discriminators +#### Union Discriminators -**[See IDL Example](#unions-discriminators)** +**[See IDL Example](#union-discriminators)** ```C++ AST_Union *node = /* ... */; @@ -519,3 +526,8 @@ to fix memory leaks caused by annotations. This change involved replacing `typedef ACE_Vector<AST_Annotation_Appl> AST_Annotation_Appls` with a class of the same name. This also allowed for moving `UTL_find_annotation` into `AST_Annotation_Appls` as `find` for a nicer design. + +### TAO 2.5.6 + +The TAO IDL Frontend no longer internally prefixes annotation names and +annotation member names with `_cxx_` if they are also a C++ keyword. diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp index 02e266926e7..9379a9bc8c1 100644 --- a/TAO/TAO_IDL/fe/fe_lookup.cpp +++ b/TAO/TAO_IDL/fe/fe_lookup.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_string.h" /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /mnt/arch/data/work/oci/ace_tao/tao_idl_fixes/ACE_TAO/ACE/bin/ace_gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat */ +/* Command-line: /home/fred/oci/ace_tao/tao_idl_fixes/ACE_TAO/ACE/bin/ace_gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat */ unsigned int TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len) { diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index ec67661f415..d38d0c5e995 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -668,46 +668,46 @@ static const yytype_uint16 yyrline[] = 2014, 2026, 2027, 2036, 2045, 2057, 2058, 2067, 2076, 2088, 2146, 2147, 2154, 2158, 2163, 2170, 2174, 2178, 2183, 2187, 2191, 2195, 2202, 2271, 2270, 2297, 2298, 2302, 2303, 2304, - 2306, 2305, 2314, 2315, 2319, 2373, 2377, 2384, 2397, 2407, - 2415, 2414, 2497, 2501, 2508, 2517, 2524, 2532, 2538, 2545, - 2556, 2555, 2564, 2568, 2572, 2576, 2602, 2610, 2609, 2681, - 2682, 2686, 2693, 2694, 2720, 2721, 2722, 2723, 2724, 2725, - 2726, 2727, 2731, 2732, 2733, 2734, 2738, 2739, 2740, 2744, - 2745, 2749, 2761, 2759, 2784, 2791, 2792, 2796, 2808, 2806, - 2831, 2838, 2854, 2872, 2873, 2877, 2881, 2885, 2892, 2896, - 2900, 2907, 2911, 2915, 2922, 2929, 2933, 2940, 2947, 2954, - 2961, 2969, 2968, 2982, 3013, 3017, 2981, 3034, 3037, 3038, - 3042, 3060, 3064, 3059, 3122, 3121, 3134, 3133, 3146, 3150, - 3183, 3187, 3246, 3250, 3145, 3272, 3279, 3292, 3301, 3308, - 3309, 3418, 3421, 3422, 3427, 3431, 3426, 3467, 3466, 3478, - 3488, 3506, 3514, 3513, 3527, 3531, 3526, 3547, 3546, 3597, - 3622, 3646, 3650, 3681, 3685, 3645, 3709, 3714, 3712, 3718, - 3722, 3762, 3766, 3760, 3854, 3925, 3934, 3924, 3948, 3958, - 3962, 3956, 4007, 4033, 4042, 4046, 4040, 4082, 4108, 4116, - 4115, 4162, 4172, 4190, 4198, 4202, 4197, 4262, 4263, 4268, - 4272, 4276, 4280, 4267, 4347, 4351, 4355, 4359, 4346, 4435, - 4439, 4468, 4472, 4434, 4488, 4492, 4558, 4562, 4486, 4597, - 4602, 4607, 4614, 4615, 4626, 4631, 4674, 4625, 4694, 4693, - 4702, 4701, 4712, 4717, 4715, 4721, 4726, 4730, 4725, 4769, - 4768, 4777, 4776, 4787, 4792, 4790, 4796, 4801, 4805, 4800, - 4850, 4857, 4858, 4859, 4966, 4970, 4974, 4982, 4986, 4981, - 4995, 5003, 5007, 5002, 5016, 5024, 5028, 5023, 5037, 5045, - 5049, 5044, 5058, 5065, 5077, 5075, 5098, 5105, 5133, 5170, - 5171, 5175, 5204, 5243, 5247, 5203, 5264, 5268, 5262, 5309, - 5308, 5316, 5323, 5324, 5329, 5328, 5337, 5336, 5345, 5344, - 5353, 5352, 5361, 5360, 5369, 5368, 5377, 5376, 5386, 5476, - 5482, 5507, 5613, 5622, 5626, 5632, 5704, 5776, 5850, 5849, - 5897, 5901, 5905, 5909, 5913, 5917, 5896, 5970, 5969, 5977, - 5984, 5989, 5997, 6001, 5996, 6011, 6012, 6016, 6018, 6017, - 6026, 6025, 6038, 6061, 6036, 6087, 6114, 6085, 6138, 6139, - 6140, 6144, 6145, 6149, 6176, 6206, 6250, 6254, 6204, 6269, - 6278, 6296, 6307, 6306, 6344, 6393, 6397, 6342, 6412, 6416, - 6423, 6427, 6431, 6435, 6439, 6443, 6447, 6451, 6455, 6459, - 6467, 6498, 6511, 6518, 6543, 6561, 6568, 6583, 6590, 6600, - 6604, 6624, 6628, 6599, 6641, 6647, 6650, 6657, 6656, 6663, - 6662, 6669, 6668, 6678, 6747, 6797, 6813, 6826, 6833, 6892, - 6897, 6901, 6896, 6962, 6966, 6961, 6979, 6980, 6985, 6984, - 6993, 6992, 7001, 7000, 7009, 7008 + 2306, 2305, 2314, 2315, 2319, 2375, 2379, 2386, 2399, 2409, + 2417, 2416, 2499, 2503, 2510, 2519, 2526, 2534, 2540, 2547, + 2560, 2559, 2568, 2572, 2576, 2580, 2606, 2614, 2613, 2685, + 2686, 2690, 2697, 2698, 2724, 2725, 2726, 2727, 2728, 2729, + 2730, 2731, 2735, 2736, 2737, 2738, 2742, 2743, 2744, 2748, + 2749, 2753, 2765, 2763, 2788, 2795, 2796, 2800, 2812, 2810, + 2835, 2842, 2858, 2876, 2877, 2881, 2885, 2889, 2896, 2900, + 2904, 2911, 2915, 2919, 2926, 2933, 2937, 2944, 2951, 2958, + 2965, 2973, 2972, 2986, 3017, 3021, 2985, 3038, 3041, 3042, + 3046, 3064, 3068, 3063, 3126, 3125, 3138, 3137, 3150, 3154, + 3187, 3191, 3250, 3254, 3149, 3276, 3283, 3296, 3305, 3312, + 3313, 3422, 3425, 3426, 3431, 3435, 3430, 3471, 3470, 3482, + 3492, 3510, 3518, 3517, 3531, 3535, 3530, 3551, 3550, 3601, + 3626, 3650, 3654, 3685, 3689, 3649, 3713, 3718, 3716, 3722, + 3726, 3766, 3770, 3764, 3858, 3929, 3938, 3928, 3952, 3962, + 3966, 3960, 4011, 4037, 4046, 4050, 4044, 4086, 4112, 4120, + 4119, 4166, 4176, 4194, 4202, 4206, 4201, 4266, 4267, 4272, + 4276, 4280, 4284, 4271, 4351, 4355, 4359, 4363, 4350, 4439, + 4443, 4472, 4476, 4438, 4492, 4496, 4562, 4566, 4490, 4601, + 4606, 4611, 4618, 4619, 4630, 4635, 4678, 4629, 4698, 4697, + 4706, 4705, 4716, 4721, 4719, 4725, 4730, 4734, 4729, 4773, + 4772, 4781, 4780, 4791, 4796, 4794, 4800, 4805, 4809, 4804, + 4854, 4861, 4862, 4863, 4970, 4974, 4978, 4986, 4990, 4985, + 4999, 5007, 5011, 5006, 5020, 5028, 5032, 5027, 5041, 5049, + 5053, 5048, 5062, 5069, 5081, 5079, 5102, 5109, 5137, 5174, + 5175, 5179, 5208, 5247, 5251, 5207, 5268, 5272, 5266, 5313, + 5312, 5320, 5327, 5328, 5333, 5332, 5341, 5340, 5349, 5348, + 5357, 5356, 5365, 5364, 5373, 5372, 5381, 5380, 5390, 5480, + 5486, 5511, 5617, 5626, 5630, 5636, 5708, 5780, 5854, 5853, + 5901, 5905, 5909, 5913, 5917, 5921, 5900, 5974, 5973, 5981, + 5988, 5993, 6001, 6005, 6000, 6015, 6016, 6020, 6022, 6021, + 6030, 6029, 6042, 6065, 6040, 6091, 6118, 6089, 6142, 6143, + 6144, 6148, 6149, 6153, 6180, 6210, 6254, 6258, 6208, 6273, + 6282, 6300, 6311, 6310, 6348, 6397, 6401, 6346, 6416, 6420, + 6427, 6431, 6435, 6439, 6443, 6447, 6451, 6455, 6459, 6463, + 6471, 6502, 6515, 6522, 6547, 6565, 6572, 6587, 6594, 6604, + 6608, 6628, 6632, 6603, 6645, 6651, 6654, 6661, 6660, 6667, + 6666, 6673, 6672, 6682, 6751, 6801, 6817, 6830, 6837, 6896, + 6901, 6905, 6900, 6966, 6970, 6965, 6983, 6984, 6989, 6988, + 6997, 6996, 7005, 7004, 7013, 7012 }; #endif @@ -4684,6 +4684,8 @@ yyreduce: AST_Expression::ExprType type = (yyvsp[-3].etval); Identifier *name = (yyvsp[-2].idval); + // Annotation Member Names Can't Clash with C++ keywords + FE_Utils::original_local_name (name); UTL_ScopedName *scoped_name = new UTL_ScopedName (name, 0); AST_Expression *default_value = (yyvsp[-1].exval); @@ -4728,27 +4730,27 @@ yyreduce: delete result; } } -#line 4732 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4734 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 205: -#line 2374 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2376 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = (yyvsp[0].exval); } -#line 4740 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4742 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 206: -#line 2378 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2380 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = 0; } -#line 4748 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4750 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 207: -#line 2385 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2387 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -4758,11 +4760,11 @@ yyreduce: } (yyval.annotations_val) = annotations; } -#line 4762 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4764 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 208: -#line 2398 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2400 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -4772,19 +4774,19 @@ yyreduce: } (yyval.annotations_val) = annotations; } -#line 4776 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4778 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 209: -#line 2408 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2410 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotations_val) = new AST_Annotation_Appls (); } -#line 4784 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4786 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 210: -#line 2415 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2417 "fe/idl.ypp" /* yacc.c:1651 */ { if (idl_global->idl_version_ < IDL_VERSION_4) { @@ -4837,11 +4839,11 @@ yyreduce: (yyval.annotation_decl_val) = decl; } -#line 4841 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4843 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 211: -#line 2468 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2470 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->ignore_lookup_errors_ = false; AST_Annotation_Appl *appl = 0; @@ -4868,27 +4870,27 @@ yyreduce: (yyval.annotation_val) = appl; } -#line 4872 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4874 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 212: -#line 2498 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2500 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 4880 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4882 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 213: -#line 2502 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2504 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = 0; } -#line 4888 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4890 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 214: -#line 2509 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2511 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params; AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; @@ -4897,99 +4899,101 @@ yyreduce: params->push (param); (yyval.annotation_params_val) = params; } -#line 4901 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4903 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 215: -#line 2518 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2520 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 4909 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4911 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 216: -#line 2525 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2527 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4919 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4921 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 217: -#line 2533 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2535 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4929 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4931 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 218: -#line 2539 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2541 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 4937 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4939 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 219: -#line 2546 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2548 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = (yyvsp[-2].idval); + // Annotation Member Names Can't Clash with C++ keywords + FE_Utils::original_local_name (param->id); param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 4948 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4952 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 220: -#line 2556 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2560 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4957 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4961 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 221: -#line 2561 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2565 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4965 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4969 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 222: -#line 2565 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2569 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4973 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4977 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 223: -#line 2569 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2573 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4981 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4985 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 224: -#line 2573 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2577 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4989 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4993 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 225: -#line 2577 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2581 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Native *node = 0; @@ -5015,27 +5019,27 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 5019 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5023 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 226: -#line 2603 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2607 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 5027 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5031 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 227: -#line 2610 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2614 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 5035 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5039 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 228: -#line 2614 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2618 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -5100,22 +5104,22 @@ yyreduce: (yyval.dcval) = t; } -#line 5104 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5108 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 231: -#line 2687 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2691 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5115 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5119 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 233: -#line 2695 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2699 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5138,30 +5142,30 @@ yyreduce: (yyval.dcval) = d; } -#line 5142 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5146 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 251: -#line 2750 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2754 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5153 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5157 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 252: -#line 2761 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2765 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5161 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5165 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 253: -#line 2765 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2769 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5181,38 +5185,38 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5185 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5189 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 254: -#line 2785 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2789 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dlval) = 0; } -#line 5193 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5197 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 257: -#line 2797 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2801 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5204 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5208 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 258: -#line 2808 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2812 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5212 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5216 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 259: -#line 2812 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2816 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5232,19 +5236,19 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5236 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5240 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 260: -#line 2832 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2836 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dlval) = 0; } -#line 5244 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5248 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 261: -#line 2839 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2843 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5257,11 +5261,11 @@ yyreduce: 0), 1); } -#line 5261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5265 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 262: -#line 2855 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2859 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5276,156 +5280,156 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 5280 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5284 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 265: -#line 2878 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2882 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_long; } -#line 5288 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5292 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 266: -#line 2882 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2886 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5296 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5300 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 267: -#line 2886 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2890 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_short; } -#line 5304 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5308 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 268: -#line 2893 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2897 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5312 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5316 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 269: -#line 2897 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2901 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5320 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5324 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 270: -#line 2901 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2905 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5328 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5332 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 271: -#line 2908 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2912 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_double; } -#line 5336 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5340 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 272: -#line 2912 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2916 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_float; } -#line 5344 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5348 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 273: -#line 2916 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2920 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5352 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5356 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 274: -#line 2923 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2927 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5360 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5364 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 275: -#line 2930 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2934 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_char; } -#line 5368 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5372 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 276: -#line 2934 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2938 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5376 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5380 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 277: -#line 2941 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2945 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_octet; } -#line 5384 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5388 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 278: -#line 2948 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2952 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_bool; } -#line 5392 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5396 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 279: -#line 2955 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2959 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_any; } -#line 5400 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5404 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 280: -#line 2962 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2966 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_object; } -#line 5408 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5412 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 281: -#line 2969 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2973 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5416 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5420 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 282: -#line 2973 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2977 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5425 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5429 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 283: -#line 2982 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2986 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -5456,27 +5460,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5460 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5464 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 284: -#line 3013 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3017 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5468 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5472 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 285: -#line 3017 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3021 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5476 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5480 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 286: -#line 3021 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3025 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); @@ -5488,11 +5492,11 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5492 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5496 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 290: -#line 3043 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3047 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Decls *members = (yyvsp[0].decls_val); @@ -5506,27 +5510,27 @@ yyreduce: delete annotations; delete members; } -#line 5510 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5514 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 291: -#line 3060 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3064 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5518 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5522 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 292: -#line 3064 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3068 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5526 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5530 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 293: -#line 3068 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3072 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -5580,53 +5584,53 @@ yyreduce: (yyval.decls_val) = members; } -#line 5584 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5588 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 294: -#line 3122 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3126 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state ()); } -#line 5592 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5596 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 295: -#line 3126 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3130 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5601 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5605 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 296: -#line 3134 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3138 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5609 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5613 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 297: -#line 3138 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3142 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5618 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5622 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 298: -#line 3146 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3150 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5626 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5630 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 299: -#line 3150 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3154 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[-3].idval), 0); @@ -5659,19 +5663,19 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5663 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5667 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 300: -#line 3183 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3187 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5671 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5675 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 301: -#line 3187 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3191 "fe/idl.ypp" /* yacc.c:1651 */ { /* * The top of the scopes must be an empty union we added after we @@ -5730,27 +5734,27 @@ yyreduce: delete disc_annotations; } -#line 5734 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5738 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 302: -#line 3246 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3250 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5742 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5746 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 303: -#line 3250 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3254 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5750 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5754 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 304: -#line 3254 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3258 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -5766,22 +5770,22 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5770 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5774 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 305: -#line 3273 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3277 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5781 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5785 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 306: -#line 3280 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3284 "fe/idl.ypp" /* yacc.c:1651 */ { /* wchars are not allowed. */ if ((yyvsp[0].etval) == AST_Expression::EV_wchar) @@ -5794,11 +5798,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5798 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5802 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 307: -#line 3293 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3297 "fe/idl.ypp" /* yacc.c:1651 */ { /* octets are not allowed. */ idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); @@ -5807,22 +5811,22 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5811 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5815 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 308: -#line 3302 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3306 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5822 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5826 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 310: -#line 3310 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3314 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5929,27 +5933,27 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5933 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5937 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 314: -#line 3427 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3431 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5941 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5945 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 315: -#line 3431 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3435 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5949 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5953 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 316: -#line 3435 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3439 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; @@ -5981,39 +5985,39 @@ yyreduce: delete annotations; } -#line 5985 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5989 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 317: -#line 3467 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3471 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 5993 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5997 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 318: -#line 3471 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3475 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6002 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6006 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 319: -#line 3479 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3483 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.llval), UTL_LabelList ((yyvsp[-1].ulval), (yyvsp[0].llval)), 1); } -#line 6013 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6017 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 320: -#line 3489 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3493 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, @@ -6031,27 +6035,27 @@ yyreduce: (yyval.llval) = (yyvsp[-1].llval); } } -#line 6035 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6039 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 321: -#line 3507 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3511 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.llval) = 0; } -#line 6043 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6047 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 322: -#line 3514 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3518 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 6051 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6055 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 323: -#line 3518 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3522 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6060,27 +6064,27 @@ yyreduce: 0 ); } -#line 6064 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6068 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 324: -#line 3527 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3531 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 6072 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6076 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 325: -#line 3531 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3535 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 6080 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6084 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 326: -#line 3535 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3539 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6089,19 +6093,19 @@ yyreduce: (yyvsp[-2].exval) ); } -#line 6093 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6097 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 327: -#line 3547 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3551 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 6101 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6105 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 328: -#line 3551 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3555 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -6145,11 +6149,11 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 6149 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6153 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 329: -#line 3598 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3602 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6171,11 +6175,11 @@ yyreduce: (yyval.dcval) = d; } -#line 6175 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6179 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 330: -#line 3623 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3627 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6195,19 +6199,19 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6199 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6203 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 331: -#line 3646 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3650 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6207 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6211 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 332: -#line 3650 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3654 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6238,27 +6242,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6242 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6246 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 333: -#line 3681 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3685 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6250 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6254 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 334: -#line 3685 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3689 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6258 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6262 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 335: -#line 3689 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3693 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6277,19 +6281,19 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6281 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6285 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 337: -#line 3714 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3718 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6289 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6293 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 340: -#line 3723 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3727 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); @@ -6324,27 +6328,27 @@ yyreduce: delete annotations; } -#line 6328 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6332 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 341: -#line 3762 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3766 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6336 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6340 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 342: -#line 3766 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3770 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6344 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6348 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 343: -#line 3770 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3774 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6429,11 +6433,11 @@ yyreduce: ev = 0; (yyval.dcval) = seq; } -#line 6433 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6437 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 344: -#line 3856 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3860 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6499,11 +6503,11 @@ yyreduce: delete type_annotations; (yyval.dcval) = seq; } -#line 6503 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6507 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 345: -#line 3925 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3929 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -6512,19 +6516,19 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6516 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6520 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 346: -#line 3934 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3938 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6524 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6528 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 347: -#line 3938 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3942 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair; @@ -6532,36 +6536,36 @@ yyreduce: seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 6536 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6540 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 348: -#line 3949 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3953 "fe/idl.ypp" /* yacc.c:1651 */ { (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6545 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6549 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 349: -#line 3958 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3962 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6553 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6557 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 350: -#line 3962 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3966 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6561 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6565 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 351: -#line 3966 "fe/idl.ypp" /* yacc.c:1651 */ +#line 3970 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6603,11 +6607,11 @@ yyreduce: delete ev; ev = 0; } -#line 6607 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6611 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 352: -#line 4008 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4012 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6630,35 +6634,35 @@ yyreduce: (yyval.dcval) = tao_string_decl; } -#line 6634 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6638 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 353: -#line 4034 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4038 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6642 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6646 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 354: -#line 4042 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4046 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6650 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6654 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 355: -#line 4046 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4050 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6658 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6662 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 356: -#line 4050 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4054 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6691,11 +6695,11 @@ yyreduce: (yyval.dcval) = string; } } -#line 6695 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6699 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 357: -#line 4083 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4087 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6718,27 +6722,27 @@ yyreduce: (yyval.dcval) = string; } -#line 6722 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6726 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 358: -#line 4109 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4113 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6730 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6734 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 359: -#line 4116 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4120 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6738 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6742 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 360: -#line 4120 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4124 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -6778,22 +6782,22 @@ yyreduce: (yyval.dcval) = array; } -#line 6782 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6786 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 361: -#line 4163 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4167 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 6793 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6797 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 362: -#line 4173 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4177 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, @@ -6811,35 +6815,35 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6815 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6819 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 363: -#line 4191 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4195 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.elval) = 0; } -#line 6823 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6827 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 364: -#line 4198 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4202 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6831 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6835 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 365: -#line 4202 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4206 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6839 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6843 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 366: -#line 4206 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4210 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -6893,43 +6897,43 @@ yyreduce: delete ev; ev = 0; } -#line 6897 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 369: -#line 4268 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4272 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6905 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6909 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 370: -#line 4272 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4276 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6913 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6917 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 371: -#line 4276 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4280 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6921 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6925 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 372: -#line 4280 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4284 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6929 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6933 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 373: -#line 4284 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4288 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -6989,43 +6993,43 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 6993 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6997 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 374: -#line 4347 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4351 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 7001 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7005 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 375: -#line 4351 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4355 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7009 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7013 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 376: -#line 4355 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4359 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7017 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7021 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 377: -#line 4359 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4363 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 7025 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7029 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 378: -#line 4363 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4367 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7094,19 +7098,19 @@ yyreduce: delete (yyvsp[-4].dlval); (yyvsp[-4].dlval) = 0; } -#line 7098 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7102 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 379: -#line 4435 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4439 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 7106 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7110 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 380: -#line 4439 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4443 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -7135,27 +7139,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7139 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7143 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 381: -#line 4468 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4472 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 7147 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7151 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 382: -#line 4472 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4476 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 7155 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7159 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 383: -#line 4476 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4480 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* @@ -7163,19 +7167,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7167 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7171 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 384: -#line 4488 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4492 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7175 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7179 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 385: -#line 4492 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4496 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); @@ -7241,27 +7245,27 @@ yyreduce: delete (yyvsp[-1].annotations_val); } -#line 7245 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7249 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 386: -#line 4558 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4562 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7253 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7257 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 387: -#line 4562 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4566 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7265 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 388: -#line 4566 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4570 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; @@ -7290,57 +7294,57 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7294 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7298 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 389: -#line 4598 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4602 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7303 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7307 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 390: -#line 4603 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4607 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7312 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7316 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 391: -#line 4608 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4612 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7320 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7324 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 393: -#line 4616 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4620 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7331 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7335 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 394: -#line 4626 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4630 "fe/idl.ypp" /* yacc.c:1651 */ { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7340 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7344 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 395: -#line 4631 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4635 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7383,19 +7387,19 @@ yyreduce: delete (yyvsp[-1].annotations_val); } -#line 7387 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7391 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 396: -#line 4674 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4678 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7395 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7399 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 397: -#line 4678 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4682 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7408,67 +7412,67 @@ yyreduce: idl_global->scopes ().pop (); } -#line 7412 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7416 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 398: -#line 4694 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4698 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7420 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7424 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 399: -#line 4698 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4702 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7428 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7432 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 400: -#line 4702 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4706 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7436 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7440 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 401: -#line 4707 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4711 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7444 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7448 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 403: -#line 4717 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4721 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7452 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7456 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 406: -#line 4726 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4730 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7460 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7464 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 407: -#line 4730 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4734 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7468 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7472 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 408: -#line 4734 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4738 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7500,67 +7504,67 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7504 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7508 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 409: -#line 4769 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4773 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7512 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7516 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 410: -#line 4773 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4777 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7520 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7524 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 411: -#line 4777 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4781 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7528 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7532 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 412: -#line 4782 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4786 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7536 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7540 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 414: -#line 4792 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4796 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7544 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7548 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 417: -#line 4801 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4805 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7552 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7556 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 418: -#line 4805 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4809 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7560 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7564 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 419: -#line 4809 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4813 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7599,22 +7603,22 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7603 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7607 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 420: -#line 4851 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4855 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 7614 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7618 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 423: -#line 4860 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4864 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -7718,186 +7722,186 @@ yyreduce: (yyval.dcval) = d; } -#line 7722 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7726 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 424: -#line 4967 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4971 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_IN; } -#line 7730 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7734 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 425: -#line 4971 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4975 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_OUT; } -#line 7738 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7742 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 426: -#line 4975 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4979 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7746 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7750 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 427: -#line 4982 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4986 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7754 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7758 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 428: -#line 4986 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4990 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7762 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7766 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 429: -#line 4991 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4995 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7771 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7775 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 430: -#line 4996 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5000 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7779 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7783 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 431: -#line 5003 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5007 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7787 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7791 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 432: -#line 5007 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5011 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7795 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7799 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 433: -#line 5012 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5016 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7804 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7808 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 434: -#line 5017 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5021 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7812 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7816 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 435: -#line 5024 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5028 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7820 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7824 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 436: -#line 5028 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5032 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7828 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7832 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 437: -#line 5033 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5037 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7837 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7841 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 438: -#line 5038 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5042 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7845 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7849 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 439: -#line 5045 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5049 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7853 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7857 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 440: -#line 5049 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5053 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 7861 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7865 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 441: -#line 5054 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5058 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7870 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7874 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 442: -#line 5059 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5063 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7878 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7882 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 443: -#line 5066 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5070 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 7889 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7893 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 444: -#line 5077 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5081 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7897 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 445: -#line 5081 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5085 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, @@ -7915,19 +7919,19 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7919 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7923 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 446: -#line 5099 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5103 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7927 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7931 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 447: -#line 5106 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5110 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -7952,11 +7956,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7956 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7960 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 448: -#line 5134 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5138 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -7990,11 +7994,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7994 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7998 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 451: -#line 5177 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5181 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8018,11 +8022,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8022 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8026 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 452: -#line 5204 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5208 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Component *c = 0; @@ -8061,27 +8065,27 @@ yyreduce: */ idl_global->scopes ().push (c); } -#line 8065 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8069 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 453: -#line 5243 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5247 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 8073 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8077 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 454: -#line 5247 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5251 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 8081 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8085 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 455: -#line 5251 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5255 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -8090,27 +8094,27 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8094 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8098 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 456: -#line 5264 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5268 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 8102 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8106 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 457: -#line 5268 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5272 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8110 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8114 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 458: -#line 5272 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5276 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -8144,147 +8148,147 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 8148 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8152 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 459: -#line 5309 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5313 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8156 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8160 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 460: -#line 5313 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5317 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8164 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8168 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 461: -#line 5317 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5321 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8172 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8176 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 464: -#line 5329 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5333 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8180 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8184 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 465: -#line 5333 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5337 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8188 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8192 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 466: -#line 5337 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5341 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8196 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8200 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 467: -#line 5341 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5345 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8204 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8208 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 468: -#line 5345 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5349 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8212 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8216 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 469: -#line 5349 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5353 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8220 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8224 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 470: -#line 5353 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5357 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8228 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8232 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 471: -#line 5357 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5361 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8236 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8240 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 472: -#line 5361 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5365 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8244 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8248 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 473: -#line 5365 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5369 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8252 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8256 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 474: -#line 5369 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5373 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8260 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8264 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 475: -#line 5373 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5377 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8268 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8272 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 476: -#line 5377 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5381 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8276 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8280 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 477: -#line 5381 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5385 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8284 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8288 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 478: -#line 5387 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5391 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8371,21 +8375,21 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8375 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8379 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 479: -#line 5477 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5481 "fe/idl.ypp" /* yacc.c:1651 */ { // Lookups and checking are done where the 'interface_type' // token is used, in 'provides_decl' and 'uses_decl'. (yyval.idlist) = (yyvsp[0].idlist); } -#line 8385 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8389 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 480: -#line 5483 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5487 "fe/idl.ypp" /* yacc.c:1651 */ { Identifier *corba_id = 0; @@ -8408,11 +8412,11 @@ yyreduce: conc_name), 1); } -#line 8412 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8416 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 481: -#line 5508 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5512 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8515,37 +8519,37 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8519 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8523 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 482: -#line 5614 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5618 "fe/idl.ypp" /* yacc.c:1651 */ { // We use this extra rule here to use in both uses_decl and // extended_uses_decl, so the LALR(1) parser can avoid conflicts. (yyval.bval) = (yyvsp[0].bval); } -#line 8529 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8533 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 483: -#line 5623 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5627 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = true; } -#line 8537 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8541 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 484: -#line 5627 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5631 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = false; } -#line 8545 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8549 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 485: -#line 5633 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5637 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8615,11 +8619,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8619 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8623 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 486: -#line 5705 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5709 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8689,11 +8693,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8693 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8697 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 487: -#line 5777 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5781 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8763,11 +8767,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8767 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8771 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 488: -#line 5850 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5854 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -8804,70 +8808,70 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8808 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8812 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 489: -#line 5887 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5891 "fe/idl.ypp" /* yacc.c:1651 */ { /* * Done with this component - pop it off the scopes stack. */ idl_global->scopes ().pop (); } -#line 8819 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8823 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 490: -#line 5897 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5901 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8827 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8831 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 491: -#line 5901 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5905 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8835 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8839 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 492: -#line 5905 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5909 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8843 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8847 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 493: -#line 5909 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5913 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8851 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8855 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 494: -#line 5913 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5917 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8859 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8863 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 495: -#line 5917 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5921 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8867 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8871 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 496: -#line 5921 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5925 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -8913,107 +8917,107 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8917 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8921 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 497: -#line 5970 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5974 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8925 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8929 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 498: -#line 5974 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5978 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8933 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8937 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 499: -#line 5978 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5982 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8941 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8945 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 500: -#line 5986 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5990 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8949 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8953 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 501: -#line 5990 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5994 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8957 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8961 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 502: -#line 5997 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6001 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8965 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8969 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 503: -#line 6001 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6005 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8973 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8977 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 504: -#line 6005 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6009 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 8981 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8985 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 508: -#line 6018 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6022 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 8989 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8993 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 509: -#line 6022 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6026 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8997 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9001 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 510: -#line 6026 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6030 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 9005 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9009 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 511: -#line 6030 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6034 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9013 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9017 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 512: -#line 6038 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6042 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9036,19 +9040,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9040 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9044 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 513: -#line 6061 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6065 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9048 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9052 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 514: -#line 6065 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6069 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9066,11 +9070,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9070 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9074 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 515: -#line 6087 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6091 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9097,19 +9101,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9101 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9105 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 516: -#line 6114 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6118 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9109 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9113 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 517: -#line 6118 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6122 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9127,11 +9131,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9131 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9135 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 523: -#line 6151 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6155 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9154,11 +9158,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9158 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9162 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 524: -#line 6179 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6183 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9181,11 +9185,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9185 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9189 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 525: -#line 6206 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6210 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9229,27 +9233,27 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9233 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9237 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 526: -#line 6250 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6254 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9241 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9245 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 527: -#line 6254 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6258 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9249 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9253 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 528: -#line 6258 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6262 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9258,19 +9262,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9262 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9266 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 529: -#line 6272 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6276 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9270 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9274 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 530: -#line 6281 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6285 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9283,29 +9287,29 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9287 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9291 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 531: -#line 6298 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6302 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9297 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9301 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 532: -#line 6307 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6311 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9305 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9309 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 533: -#line 6311 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6315 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -9334,11 +9338,11 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9338 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9342 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 534: -#line 6344 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6348 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9387,27 +9391,27 @@ yyreduce: */ idl_global->scopes ().push (e); } -#line 9391 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9395 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 535: -#line 6393 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6397 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9399 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9403 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 536: -#line 6397 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6401 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9407 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9411 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 537: -#line 6401 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6405 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9416,108 +9420,108 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9420 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9424 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 538: -#line 6413 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6417 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9428 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9432 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 539: -#line 6417 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6421 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9436 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9440 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 540: -#line 6424 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6428 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_type; } -#line 9444 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9448 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 541: -#line 6428 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6432 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_struct; } -#line 9452 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9456 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 542: -#line 6432 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6436 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_union; } -#line 9460 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9464 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 543: -#line 6436 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6440 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9468 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9472 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 544: -#line 6440 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6444 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9476 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9480 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 545: -#line 6444 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6448 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_interface; } -#line 9484 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9488 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 546: -#line 6448 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6452 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9492 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9496 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 547: -#line 6452 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6456 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_enum; } -#line 9500 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9504 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 548: -#line 6456 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6460 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_except; } -#line 9508 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9512 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 549: -#line 6460 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6464 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9517 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9521 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 550: -#line 6468 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6472 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].plval) == 0) { @@ -9545,11 +9549,11 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9549 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9553 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 551: -#line 6499 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6503 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-2].plval) == 0) { @@ -9562,19 +9566,19 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9566 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9570 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 552: -#line 6512 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6516 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.plval) = 0; } -#line 9574 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9578 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 553: -#line 6519 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6523 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), @@ -9599,11 +9603,11 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9603 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9607 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 554: -#line 6544 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6548 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9618,19 +9622,19 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9622 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9626 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 555: -#line 6562 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6566 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 9630 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9634 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 556: -#line 6569 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6573 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -9645,37 +9649,37 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9649 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9653 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 557: -#line 6584 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6588 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 9657 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9661 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 558: -#line 6591 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6595 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9667 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9671 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 559: -#line 6600 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6604 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9675 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9679 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 560: -#line 6604 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6608 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9695,102 +9699,102 @@ yyreduce: delete (yyvsp[-1].annotations_val); } -#line 9699 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9703 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 561: -#line 6624 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6628 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9707 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9711 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 562: -#line 6628 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6632 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9715 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9719 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 563: -#line 6632 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6636 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); // Done with this port type - pop it off the scopes stack. idl_global->scopes ().pop (); } -#line 9726 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9730 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 564: -#line 6642 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6646 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9733 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9737 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 565: -#line 6648 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6652 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9740 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9744 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 566: -#line 6651 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6655 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9747 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9751 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 567: -#line 6657 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6661 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9754 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9758 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 568: -#line 6660 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6664 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9761 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9765 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 569: -#line 6663 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6667 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9768 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 570: -#line 6666 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6670 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9775 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9779 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 571: -#line 6669 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6673 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9783 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9787 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 572: -#line 6673 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6677 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9790 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9794 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 573: -#line 6679 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6683 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9859,11 +9863,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9863 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9867 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 574: -#line 6748 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6752 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9910,11 +9914,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9914 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9918 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 575: -#line 6798 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6802 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].alval) == 0) { @@ -9927,11 +9931,11 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9931 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9935 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 576: -#line 6814 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6818 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-3].alval) == 0) { @@ -9944,19 +9948,19 @@ yyreduce: (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 9948 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9952 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 577: -#line 6827 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6831 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.alval) = 0; } -#line 9956 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9960 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 578: -#line 6834 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6838 "fe/idl.ypp" /* yacc.c:1651 */ { // To avoid grammar conflicts with this LALR(1) parser, // we take advantage of the fact that an expression can @@ -10012,27 +10016,27 @@ yyreduce: 0); } } -#line 10016 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10020 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 580: -#line 6897 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6901 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 10024 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10028 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 581: -#line 6901 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6905 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 10032 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10036 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 582: -#line 6905 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6909 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; @@ -10086,102 +10090,102 @@ yyreduce: delete (yyvsp[-3].annotations_val); } -#line 10090 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10094 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 583: -#line 6962 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6966 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10098 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10102 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 584: -#line 6966 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6970 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10106 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10110 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 585: -#line 6970 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6974 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen); // Done with this connector - pop it off the scope stack. idl_global->scopes ().pop (); } -#line 10117 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10121 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 588: -#line 6985 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6989 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10125 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10129 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 589: -#line 6989 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6993 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10133 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10137 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 590: -#line 6993 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6997 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10141 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10145 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 591: -#line 6997 "fe/idl.ypp" /* yacc.c:1651 */ +#line 7001 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10149 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10153 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 592: -#line 7001 "fe/idl.ypp" /* yacc.c:1651 */ +#line 7005 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10157 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10161 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 593: -#line 7005 "fe/idl.ypp" /* yacc.c:1651 */ +#line 7009 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10165 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10169 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 594: -#line 7009 "fe/idl.ypp" /* yacc.c:1651 */ +#line 7013 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10173 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10177 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 595: -#line 7013 "fe/idl.ypp" /* yacc.c:1651 */ +#line 7017 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10181 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10185 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; -#line 10185 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10189 "fe/idl.tab.cpp" /* yacc.c:1651 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10409,7 +10413,7 @@ yyreturn: #endif return yyresult; } -#line 7018 "fe/idl.ypp" /* yacc.c:1910 */ +#line 7022 "fe/idl.ypp" /* yacc.c:1910 */ /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index f0b51967b8b..87715d364ec 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -2323,6 +2323,8 @@ annotation_member AST_Expression::ExprType type = $1; Identifier *name = $2; + // Annotation member names can't clash with C++ keywords + FE_Utils::original_local_name (name); UTL_ScopedName *scoped_name = new UTL_ScopedName (name, 0); AST_Expression *default_value = $3; @@ -2546,6 +2548,8 @@ named_annotation_appl_param { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = $1; + // Annotation Member Names Can't Clash with C++ keywords + FE_Utils::original_local_name (param->id); param->expr = $3; $$ = param; } diff --git a/TAO/bin/imr_tests.lst b/TAO/bin/imr_tests.lst deleted file mode 100644 index cdbba6e75ba..00000000000 --- a/TAO/bin/imr_tests.lst +++ /dev/null @@ -1,65 +0,0 @@ -# This is the list of run_test.pl's that need to be run by -# auto_run_tests.pl. -# Each line has its own test, and a test can be followed by a -# list of configurations it does _not_ run on. -# -# Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST -# -# NOTE: This file contains examples and other service level test for -# TAO's. Please do not include regular tests here. -TAO/orbsvcs/tests/ImplRepo/run_test.pl both_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl nestea_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl airplane_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl nt_service_ir: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR Win32 !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl shutdown: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OSX -TAO/orbsvcs/tests/ImplRepo/run_test.pl perclient: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir_hash: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !OSX -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ir_shared: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl failover -replica: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl backup_restart -replica: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_ft -replica: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_listingcorrupt -replica: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_activatorcorrupt -replica: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl persistent_servercorrupt -replica: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !Win32 -TAO/orbsvcs/tests/ImplRepo/run_test.pl manual_persistent_restart: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl manual_persistent_restart_hash: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl manual_persistent_restart_shared: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/run_test.pl manual_persistent_restart_registry: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO Win32 -TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/PICurrent/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/double_start/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !Win32 -TAO/orbsvcs/tests/ImplRepo/double_start/run_test.pl -kill: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !Win32 !FIXED_BUGS_ONLY -TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523 -start_delay 3: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523 -force: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523 -force -signal 15: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/kill_server/run_test.pl -rm2523ol: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/kill_slow_server/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OSX -TAO/orbsvcs/tests/ImplRepo/manual_start/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !LynxOS !ACE_FOR_TAO !OpenVMS -TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl -servers 5 -objects 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/scale_clients/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/servers_list/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO -TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -pingexternal: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartServer/run_test.pl -manual -lockout: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -delay 20 -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -hide_server -imr_start: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl -multistart: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/link_poas/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/tests/ImplRepo/RestartIMR/run_test.pl -kill_server: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS !OpenVMS -TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ST !ACE_FOR_TAO !LynxOS diff --git a/TAO/bin/name_tests.lst b/TAO/bin/name_tests.lst deleted file mode 100644 index faa4b3974df..00000000000 --- a/TAO/bin/name_tests.lst +++ /dev/null @@ -1,21 +0,0 @@ -# This list is a duplicate of just the name service tests from tao_other_test.lst -# It is simply for local pre-commit coverage of changes isolated to the Name service. -# -TAO/orbsvcs/tests/Simple_Naming/run_test.pl: !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED !OSX -TAO/orbsvcs/tests/Simple_Naming/run_test.pl -nommap: !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED OSX -TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !DISTRIBUTED -TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl: !Win32 !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NO_MESSAGING !ACE_FOR_TAO !DISTRIBUTED -TAO/orbsvcs/tests/Redundant_Naming/run_test.pl: !Win32 !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !DISTRIBUTED -TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: IPV6 !ST !NO_MESSAGING !ACE_FOR_TAO !LynxOS !CORBA_E_MICRO !DISTRIBUTED -TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS -TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS -TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS -TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/run_test.pl: !ST !NO_MCAST !NO_MESSAGING !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS -TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS -TAO/utils/nsgroup/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO !LynxOS !ST -TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST -TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST -TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST -TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST -TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst index 221f1ea556e..16a2eb38762 100644 --- a/TAO/bin/tao_orb_tests.lst +++ b/TAO/bin/tao_orb_tests.lst @@ -208,7 +208,7 @@ TAO/tests/Bug_3954_Regression/run_test.pl: TAO/tests/Bug_4010_Regression/run_test.pl: TAO/tests/Bug_4059_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_4082_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO -TAO/tests/Bug_4097_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRRO +TAO/tests/Bug_4097_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO TAO/tests/Bug_4213_Regression/run_test.pl: !Win32 TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst index 8f84e6ed4fe..d88af4dd0e6 100644 --- a/TAO/bin/tao_other_tests.lst +++ b/TAO/bin/tao_other_tests.lst @@ -151,6 +151,7 @@ TAO/orbsvcs/tests/ImplRepo/servers_list/run_test_ft.pl: !ST !MINIMUM !CORBA_E_CO TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS +TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl -s 5: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardalways: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl -forwardonce: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !WCHAR !ACE_FOR_TAO !LynxOS @@ -307,6 +308,9 @@ TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test TAO/utils/nsgroup/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO !LynxOS !ST TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST -TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST +TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST +TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST +TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST +TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl: !Win32 !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !ACE_FOR_TAO !LynxOS !ST diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl index d947eb38e2e..aa17ce46de6 100755 --- a/TAO/examples/Callback_Quoter/run_test.pl +++ b/TAO/examples/Callback_Quoter/run_test.pl @@ -40,7 +40,7 @@ $starget->DeleteFile($nsiorbase); # Programs that are run $NS = $nstarget->CreateProcess ( - "../../orbsvcs/Naming_Service/tao_cosnaming", + "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_nsiorfile"); $N = $ntarget->CreateProcess ( "notifier", diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl index 6e60c3f97cf..db66b060116 100755 --- a/TAO/examples/Quoter/run_test.pl +++ b/TAO/examples/Quoter/run_test.pl @@ -88,10 +88,10 @@ $cltarget->DeleteFile($nsiorbase); # Programs that are run $NS = $nstarget->CreateProcess ( - "../../orbsvcs/Naming_Service/tao_cosnaming", + "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_nsiorfile"); $LC = $lctarget->CreateProcess ( - "../../orbsvcs/LifeCycle_Service/tao_coslifecycle", + "$ENV{TAO_ROOT}/orbsvcs/LifeCycle_Service/tao_coslifecycle", "$debug -ORBInitRef NameService=file://$lctarget_nsiorfile"); $SV = $svtarget->CreateProcess ( diff --git a/TAO/examples/RTCORBA/Activity/run_test.pl b/TAO/examples/RTCORBA/Activity/run_test.pl index fe5f03bf4bb..d9498e0d4bd 100755 --- a/TAO/examples/RTCORBA/Activity/run_test.pl +++ b/TAO/examples/RTCORBA/Activity/run_test.pl @@ -42,7 +42,7 @@ $client1->DeleteFile($iorfile); my $client2_iorfile = $client2->LocalFile ($iorfile); $client2->DeleteFile($iorfile); -$SV = $server->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl index 29d36203f8b..cab82541f9a 100755 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl @@ -39,7 +39,7 @@ $client->DeleteFile($iorbase); $nstarget->DeleteFile($iorbase); $starter->DeleteFile($iorbase); -$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming", +$NS = $nstarget->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_iorfile"); $SV = $server->CreateProcess ("test", "-ORBInitRef NameService=file://$server_iorfile ". diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl index 3874971868d..4b2046eee96 100755 --- a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl +++ b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl @@ -39,7 +39,7 @@ $client->DeleteFile($iorbase); $nstarget->DeleteFile($iorbase); $starter->DeleteFile($iorbase); -$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming", +$NS = $nstarget->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_iorfile"); $SV = $server->CreateProcess ("test", "-ORBInitRef NameService=file://$server_iorfile ". diff --git a/TAO/examples/ior_corbaloc/run_test.pl b/TAO/examples/ior_corbaloc/run_test.pl index c3f48786551..7e64b8597c8 100755 --- a/TAO/examples/ior_corbaloc/run_test.pl +++ b/TAO/examples/ior_corbaloc/run_test.pl @@ -55,7 +55,7 @@ for ($i = 0; $i <= $#nstargets; $i++) { } my $NS = $nstargets[$i]->CreateProcess ( - "../../orbsvcs/Naming_Service/tao_cosnaming", + "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBListenEndpoints iiop://$TARGETHOSTNAME:$ns_orb_ports[$i] ". "-o $ns_iorfile -m 0"); diff --git a/TAO/interop-tests/CdrOutArg/orbix/test_i.h b/TAO/interop-tests/CdrOutArg/orbix/test_i.h index 14526258346..57f5a544703 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/test_i.h +++ b/TAO/interop-tests/CdrOutArg/orbix/test_i.h @@ -21,9 +21,7 @@ */ class CDR_Out_Arg_i : public POA_Interop::CDR_Out_Arg { - public: - CDR_Out_Arg_i (CORBA::ORB_ptr orb); void get_out (CORBA::Long_out arg) IT_THROW_DECL((CORBA::SystemException)); @@ -31,10 +29,8 @@ public: void shutdown (void) IT_THROW_DECL((CORBA::SystemException)); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h index a7c4c008e31..ca8b8143b63 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h @@ -7,22 +7,19 @@ class StructuredEventConsumer_i : public virtual POA_CosNotifyComm::StructuredPushConsumer { public: - StructuredEventConsumer_i(CORBA::ORB_ptr orb); + StructuredEventConsumer_i(CORBA::ORB_ptr orb); - virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + virtual void push_structured_event( + const CosNotification::StructuredEvent ¬ification); - virtual void offer_change ( + virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); - virtual void disconnect_structured_push_consumer( - ); + virtual void disconnect_structured_push_consumer(); private: - CORBA::ORB_var orb_; + CORBA::ORB_var orb_; }; #endif diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h index 0f4a599cd41..2c680c65a8d 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h @@ -9,13 +9,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); private: diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h index 69d59d6dbf0..3b57225df2e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h @@ -10,13 +10,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h index caa915228d8..9220062f2f9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h @@ -10,13 +10,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index 389059de415..40368f9daef 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -248,7 +248,7 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb, ORBSVCS_DEBUG((LM_DEBUG,"Factory connected\n")); CORBA::String_var my_ior_string = orb->object_to_string(ec); - int len = ACE_OS::strlen(my_ior_string.in()) ; + int const len = ACE_OS::strlen(my_ior_string.in()) ; if (stream.send_n(my_ior_string.in(), len) != len) ORBSVCS_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 2c4ee830c36..aeb2d6bfb1c 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -106,7 +106,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf); // extract the object ID from the criteria - for (size_t i = 0; i < the_criteria.length(); ++i) + for (CORBA::ULong i = 0; i < the_criteria.length(); ++i) { const CosNaming::Name& name = the_criteria[i].nam; if (name.length() > 0) { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 8e37c42e408..48cf24e5970 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -102,16 +102,13 @@ namespace TAO //////////////// // CORBA methods virtual void push_structured_event ( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); //@} diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index afde5fdb507..462c98a8168 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -154,21 +154,17 @@ namespace TAO /// Registers the Fault Notifier with the Replication Manager. virtual void register_fault_notifier ( - FT::FaultNotifier_ptr fault_notifier - ); + FT::FaultNotifier_ptr fault_notifier); /// Returns the reference of the Fault Notifier. - virtual FT::FaultNotifier_ptr get_fault_notifier ( - ); + virtual FT::FaultNotifier_ptr get_fault_notifier (); /// TAO-specific find factory registry virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry ( - const PortableGroup::Criteria & selection_criteria - ); + const PortableGroup::Criteria & selection_criteria); /// TAO-specific shutdown operation. - virtual void shutdown ( - ); + virtual void shutdown (); //@} @@ -294,8 +290,7 @@ namespace TAO * Return the ObjectGroup reference for the given ObjectGroupId. */ virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id ( - PortableGroup::ObjectGroupId group_id - ); + PortableGroup::ObjectGroupId group_id); /** * Return the reference corresponding to the Replica of a given diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index 4095d32fb7e..75de43bf26d 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -152,8 +152,7 @@ namespace TAO /////////////////////////////////////////////// // CORBA interface FaultDetectorFactory methods virtual void change_properties ( - const PortableGroup::Properties & property_set - ); + const PortableGroup::Properties & property_set); virtual void shutdown (void); @@ -162,12 +161,10 @@ namespace TAO virtual CORBA::Object_ptr create_object ( const char * type_id, const PortableGroup::Criteria & the_criteria, - PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id - ); + PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id); virtual void delete_object ( - const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id - ); + const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id); ////////////////////////////////////////// // CORBA interface PullMonitorable methods diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h index 48995141850..544fa728309 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h @@ -68,8 +68,7 @@ namespace TAO FT::FTDomainId domain_id, const PortableGroup::Location & object_location, PortableGroup::TypeId object_type, - PortableGroup::ObjectGroupId group_id - ); + PortableGroup::ObjectGroupId group_id); /** * destructor. * Non-virtual because this class does not take part in diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index a7a9d68911f..ecc69f45a19 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -89,36 +89,29 @@ namespace TAO // See IDL for documentation virtual void push_structured_fault ( - const CosNotification::StructuredEvent & event - ); + const CosNotification::StructuredEvent & event); virtual void push_sequence_fault ( - const CosNotification::EventBatch & events - ); + const CosNotification::EventBatch & events); virtual ::CosNotifyFilter::Filter_ptr create_subscription_filter ( - const char * constraint_grammar - ); + const char * constraint_grammar); virtual FT::FaultNotifier::ConsumerId connect_structured_fault_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer, - CosNotifyFilter::Filter_ptr filter - ); + CosNotifyFilter::Filter_ptr filter); virtual FT::FaultNotifier::ConsumerId connect_sequence_fault_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer, - CosNotifyFilter::Filter_ptr filter - ); + CosNotifyFilter::Filter_ptr filter); virtual void disconnect_consumer ( - FT::FaultNotifier::ConsumerId connection - ); + FT::FaultNotifier::ConsumerId connection); ////////////////////////////////////////// // CORBA interface PullMonitorable methods virtual CORBA::Boolean is_alive (void); - ///////////////////////////////////////// // Override CORBA servant virtual methods virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index b5603c1081f..513f5d2e2de 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -230,7 +230,7 @@ AsyncAccessManager::final_state (bool active) if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state ") + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::final_state - ") ACE_TEXT ("removing this from map, server <%C> remove_on_death_rh_ <%@>\n"), this, info_->ping_id (), this->remove_on_death_rh_)); } @@ -253,10 +253,24 @@ AsyncAccessManager::notify_waiter (ImR_ResponseHandler *rh) { if (this->info_->is_mode (ImplementationRepository::PER_CLIENT)) { + if (ImR_Locator_i::debug () > 5) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::notify_waiter - ") + ACE_TEXT ("For unique server <%C> reporting back IOR <%C>\n"), + this, info_->ping_id (), this->partial_ior_.c_str())); + } rh->send_ior (this->partial_ior_.c_str()); } else { + if (ImR_Locator_i::debug () > 5) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::notify_waiter - ") + ACE_TEXT ("For server <%C> reporting back IOR <%C>\n"), + this, info_->ping_id (), this->info_->partial_ior.c_str())); + } rh->send_ior (this->info_->partial_ior.c_str()); } } @@ -451,11 +465,30 @@ AsyncAccessManager::server_is_shutting_down (void) { if (ImR_Locator_i::debug () > 4) { - this->report ("server_is_shutting_down"); + this->report ("server_is_shutting_down-start"); } + // We are informed directly by the server that it is shutting down. This doesn't + // imply that the server is dead at this point, there can be some time between + // the POA destroy and the server process exit so we have to wait for the death + // of the process before we can mark this server as dead this->prev_pid_ = this->info_->pid; - this->status (ImplementationRepository::AAM_SERVER_DEAD); - this->final_state (); + if (this->info_->death_notify) + { + // We get a death notify of the activator so we can wait on the death + // of the process + this->status (ImplementationRepository::AAM_WAIT_FOR_DEATH); + } + else + { + // We don't get a death notify of the activator so we have to assume at + // this point the server is death + this->status (ImplementationRepository::AAM_SERVER_DEAD); + this->final_state (); + } + if (ImR_Locator_i::debug () > 4) + { + this->report ("server_is_shutting_down-end"); + } } void @@ -521,7 +554,7 @@ AsyncAccessManager::notify_child_death (int pid) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, server <%C> pid <%d> status <%C> ") + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), notify_child_death, server <%C> pid <%d> status <%C> ") ACE_TEXT ("this info_.pid <%d> prev_pid <%d> waiter count <%d>\n"), this, info_->ping_id (), pid, status_name (status_), this->info_->pid, this->prev_pid_, this->rh_list_.size())); @@ -531,8 +564,12 @@ AsyncAccessManager::notify_child_death (int pid) if ((this->status_ == ImplementationRepository::AAM_WAIT_FOR_DEATH) && this->rh_list_.size() > 0) { - this->send_start_request (); - return true; + // When we have successfully made another start request we just let the + // waiters wait on the result of the new start request + if (this->send_start_request ()) + { + return true; + } } this->status (ImplementationRepository::AAM_SERVER_DEAD); this->final_state (); @@ -543,7 +580,7 @@ AsyncAccessManager::notify_child_death (int pid) if (ImR_Locator_i::debug () > 1) { ORBSVCS_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), child death, server <%C> pid <%d> does not match ") + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@), notify_child_death, server <%C> pid <%d> does not match ") ACE_TEXT ("this info_.pid <%d> prev_pid <%d>\n"), this, info_->ping_id (), pid, this->info_->pid, this->prev_pid_)); @@ -560,8 +597,18 @@ AsyncAccessManager::listener_disconnected (void) this->report ("listener_disconnected"); } - this->status (ImplementationRepository::AAM_SERVER_DEAD); - + if (this->info_->death_notify) + { + // We get a death notify of the activator so we can wait on the death + // of the process + this->status (ImplementationRepository::AAM_WAIT_FOR_DEATH); + } + else + { + // We don't get a death notify of the activator so we have to assume at + // this point the server is death + this->status (ImplementationRepository::AAM_SERVER_DEAD); + } } void @@ -603,8 +650,8 @@ AsyncAccessManager::ping_replied (LiveStatus server) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied pid = %d,") - ACE_TEXT (" transition to <WAIT_FOR_DEATH>\n"), + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied pid <%d>,") + ACE_TEXT (" waiting on ping, transition to <WAIT_FOR_DEATH>\n"), this, this->info_->pid)); } this->status (ImplementationRepository::AAM_WAIT_FOR_DEATH); @@ -613,7 +660,7 @@ AsyncAccessManager::ping_replied (LiveStatus server) if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied pid = %d,") + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied pid <%d>,") ACE_TEXT (" trying to restart server\n"), this, this->info_->pid)); } @@ -624,7 +671,31 @@ AsyncAccessManager::ping_replied (LiveStatus server) } else { - this->status (ImplementationRepository::AAM_SERVER_DEAD); + // If we get a death notify we wait for the death of the process, the fact that the + // ping failed doesn't mean the process itself is already death + if (this->info_->death_notify && this->info_->pid != 0) + { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied pid <%d>,") + ACE_TEXT (" transition to <WAIT_FOR_DEATH>\n"), + this, this->info_->pid)); + } + this->status (ImplementationRepository::AAM_WAIT_FOR_DEATH); + return; + } + else + { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::ping_replied pid <%d>,") + ACE_TEXT (" transition to <SERVER_DEAD>\n"), + this, this->info_->pid)); + } + this->status (ImplementationRepository::AAM_SERVER_DEAD); + } } } break; @@ -647,6 +718,12 @@ AsyncAccessManager::send_start_request (void) if ((this->locator_.opts ()->lockout () && !this->info_.edit ()->start_allowed ()) || (this->retries_ == 0)) { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::send_start_request, server <%C> not started because retries exceeded\n"), + this, this->info_->ping_id())); + } this->status (ImplementationRepository::AAM_RETRIES_EXCEEDED); return false; } @@ -656,6 +733,12 @@ AsyncAccessManager::send_start_request (void) if (this->info_->is_mode (ImplementationRepository::MANUAL) && !this->manual_start_) { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::send_start_request, server <%C> not started because only a manual start is allowed\n"), + this, this->info_->ping_id())); + } this->status (ImplementationRepository::AAM_NOT_MANUAL); return false; } @@ -664,6 +747,12 @@ AsyncAccessManager::send_start_request (void) if (startup->cmdline.length () == 0) { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::send_start_request, server <%C> not started because no commandline has been configured\n"), + this, this->info_->ping_id())); + } this->status (ImplementationRepository::AAM_NO_COMMANDLINE); return false; } @@ -673,6 +762,12 @@ AsyncAccessManager::send_start_request (void) if (ainfo.null () || CORBA::is_nil (ainfo->activator.in ())) { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) AsyncAccessManager(%@)::send_start_request, server <%C> not started because no activator has been found\n"), + this, this->info_->ping_id())); + } this->status (ImplementationRepository::AAM_NO_ACTIVATOR); return false; } @@ -775,6 +870,12 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder) } catch (const ImplementationRepository::CannotActivate &ca) { + if (ImR_Locator_i::debug () > 1) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) ActivatorReceiver(%@)::start_server_excep, reason <%C>\n"), + this, ca.reason.in ())); + } if (ACE_OS::strstr (ca.reason.in(),"pid:") == ca.reason.in()) { int const pid = ACE_OS::atoi (ca.reason.in()+4); @@ -785,6 +886,14 @@ ActivatorReceiver::start_server_excep (Messaging::ExceptionHolder *holder) this->aam_->activator_replied_start_running (false, 0); } } + catch (const CORBA::Exception& ex) + { + if (ImR_Locator_i::debug () > 1) + { + ex._tao_print_exception ("ActivatorReceiver::start_server_excep"); + } + } + PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); poa_->deactivate_object (oid.in()); } diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h index 1af3d7aa3b1..f5fa9b4d8ef 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.h @@ -60,7 +60,7 @@ class Locator_Export AsyncAccessManager bool is_terminating (void) const; bool is_running (void) const; - bool has_server (const char *name) const ; + bool has_server (const char *name) const; void remote_state (ImplementationRepository::AAM_Status s); void add_interest (ImR_ResponseHandler *rh, bool manual); @@ -119,7 +119,6 @@ typedef TAO_Intrusive_Ref_Count_Handle<AsyncAccessManager> AsyncAccessManager_pt * * @brief callback for handling asynch server startup requests */ - class ActivatorReceiver : public virtual POA_ImplementationRepository::AMI_ActivatorHandler { diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp index c538082bfb8..0934f68f194 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.cpp @@ -21,8 +21,7 @@ AsyncListManager::AsyncListManager (const Locator_Repository *repo, first_ (0), how_many_ (0), waiters_ (0), - refcount_ (1), - lock_ () + refcount_ (1) { } @@ -45,7 +44,7 @@ AsyncListManager::poa (void) void AsyncListManager::init_list (void) { - CORBA::ULong len = + CORBA::ULong const len = static_cast<CORBA::ULong> (this->repo_->servers ().current_size ()); Locator_Repository::SIMap::ENTRY* entry = 0; Locator_Repository::SIMap::CONST_ITERATOR it (this->repo_->servers ()); @@ -78,7 +77,7 @@ AsyncListManager::init_list (void) { if (!evaluate_status (i, l->status(), info->pid)) { - this->waiters_++; + ++this->waiters_; } else { @@ -310,14 +309,12 @@ AsyncListManager::ping_replied (CORBA::ULong index, LiveStatus status, int pid) { this->final_state (); } - return; } } AsyncListManager * AsyncListManager::_add_ref (void) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); ++this->refcount_; return this; } @@ -325,11 +322,8 @@ AsyncListManager::_add_ref (void) void AsyncListManager::_remove_ref (void) { - int count = 0; - { - ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); - count = --this->refcount_; - } + int const count = --this->refcount_; + if (count == 0) { delete this; @@ -361,7 +355,7 @@ ListLiveListener::~ListLiveListener (void) bool ListLiveListener::start (void) { - bool rtn = this->pinger_.add_poll_listener (this); + bool const rtn = this->pinger_.add_poll_listener (this); this->started_ = true; return rtn; } @@ -389,7 +383,9 @@ ListLiveListener::status_changed (LiveStatus status) else { if (this->started_) - this->owner_->ping_replied (this->index_, status, this->pid_); + { + this->owner_->ping_replied (this->index_, status, this->pid_); + } } return true; } diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h index bd722dd71ca..101a0ceb880 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h @@ -19,6 +19,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Intrusive_Ref_Count_Handle_T.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ #include "LiveCheck.h" class Locator_Repository; @@ -73,8 +78,11 @@ class AsyncListManager CORBA::ULong first_; CORBA::ULong how_many_; CORBA::ULong waiters_; - int refcount_; - TAO_SYNCH_MUTEX lock_; +#if defined (ACE_HAS_CPP11) + std::atomic<int> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> refcount_; +#endif /* ACE_HAS_CPP11 */ }; typedef TAO_Intrusive_Ref_Count_Handle<AsyncListManager> AsyncListManager_ptr; diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 3ea492fdd0c..60976e69dc6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -186,8 +186,7 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) { ior += this->key_str_.in(); - CORBA::Object_var forward_obj = - this->orb_->string_to_object (ior.c_str ()); + CORBA::Object_var forward_obj = this->orb_->string_to_object (ior.c_str ()); if (!CORBA::is_nil (forward_obj.in ())) { @@ -197,16 +196,23 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) } else { - ORBSVCS_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Forward_to ") - ACE_TEXT ("reference is nil.\n"))); + if (ImR_Locator_i::debug () > 1) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Forward_to ") + ACE_TEXT ("reference is nil for key <%C> server_name <%C>\n"), + key_str_.in (), server_name_.in ())); + } } } else { - ORBSVCS_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Invalid corbaloc ior for key <%C> server_name <%C> IOR <%C>\n"), - key_str_.in (), server_name_.in (), pior)); + if (ImR_Locator_i::debug () > 1) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) ImR_DSI_ResponseHandler::send_ior (): Invalid corbaloc ior for key <%C> server_name <%C> IOR <%C>\n"), + key_str_.in (), server_name_.in (), pior)); + } } this->invoke_excep_i (new CORBA::OBJECT_NOT_EXIST @@ -226,7 +232,7 @@ ImR_DSI_ResponseHandler::invoke_excep_i (CORBA::Exception *ex) void ImR_DSI_ResponseHandler::send_exception (CORBA::Exception *ex) { - //discard the exception, always throw a transient: + // Discard the exception, always throw a transient: delete ex; this->invoke_excep_i (new CORBA::TRANSIENT diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp index 1a4242e0cb0..d2da4e94eb2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp @@ -12,6 +12,7 @@ #include "ImR_Locator_i.h" #include "tao/ORB_Constants.h" #include "tao/ORB_Core.h" +#include "orbsvcs/Log_Macros.h" INS_Locator::INS_Locator (ImR_Locator_i& loc) : imr_locator_ (loc) @@ -63,7 +64,7 @@ INS_Locator::async_locate (::IORTable::Locate_ResponseHandler handler, //---------------------------------------------------------------------------------------- INS_Loc_ResponseHandler::INS_Loc_ResponseHandler (const char *key, ::IORTable::Locate_ResponseHandler handler) - : key_(key), + : key_str_(key), rh_ (handler) { } @@ -72,8 +73,36 @@ void INS_Loc_ResponseHandler::send_ior (const char *pior) { ACE_CString ior = pior; - ior += key_; - rh_->forward_ior (ior.c_str(), false); + + // Check that the returned ior is the expected partial ior with + // missing ObjectKey. + if (ior.find ("corbaloc:") == 0 && ior[ior.length () -1] == '/') + { + ior += key_str_; + + if (ImR_Locator_i::debug () > 5) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) INS_Loc_ResponseHandler::send_ior (): Forwarding ") + ACE_TEXT ("key <%C> to IOR <%C>\n"), + key_str_.in (), ior.c_str ())); + } + rh_->forward_ior (ior.c_str(), false); + } + else + { + if (ImR_Locator_i::debug () > 1) + { + ORBSVCS_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) INS_Loc_ResponseHandler::send_ior (): Invalid corbaloc ior for key <%C> IOR <%C>\n"), + key_str_.in (), pior)); + } + + rh_->raise_excep (CORBA::OBJECT_NOT_EXIST (CORBA::SystemException::_tao_minor_code + ( TAO_IMPLREPO_MINOR_CODE, 0), + CORBA::COMPLETED_NO)); + } + delete this; } diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h index 433dafd0a41..a948ea478d5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h @@ -35,7 +35,7 @@ public: virtual void send_exception (CORBA::Exception *ex); private: - ACE_CString key_; + CORBA::String_var key_str_; TAO_AMH_Locate_ResponseHandler_var rh_; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index d190a34fcb1..43c20f68948 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -150,7 +150,7 @@ run_service_command (Activator_Options& opts) } if (ret != -1) { - ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service installed\n")); opts.save_registry_options (); } else @@ -163,7 +163,7 @@ run_service_command (Activator_Options& opts) else if (opts.service_command () == Activator_Options::SC_REMOVE) { int ret = SERVICE::instance ()->remove (); - ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "ImR Activator: Service removed\n")); if (ret == 0) return 1; // If successful, then we don't want to continue. } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index a7443d5e356..ab2e06d5c0f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -34,6 +34,41 @@ Active_Pid_Setter::~Active_Pid_Setter() { owner_.active_check_pid_ = ACE_INVALID_PID; } + +Watchdog::Watchdog(ACE_Process_Manager& procman) : + stop_(false), + procman_(procman) +{ +} + +int +Watchdog::svc() +{ + while (!this->stop_) + { + if (this->procman_.managed() > 0) + { + this->procman_.wait(0, ACE_Time_Value(0, 25000)); + } + else + { + ACE_OS::sleep (ACE_Time_Value(0, 25000)); + } + } + return 0; +} + +bool +Watchdog::start() +{ + return this->activate() == 0; +} +void +Watchdog::stop() +{ + this->stop_ = true; + this->wait(); +} #endif /* ACE_WIN32 */ ImR_Activator_i::ImR_Activator_i (void) @@ -46,6 +81,9 @@ ImR_Activator_i::ImR_Activator_i (void) , max_env_vars_ (Activator_Options::ENVIRONMENT_MAX_VARS) , detach_child_ (false) , active_check_pid_ (ACE_INVALID_PID) +#if defined (ACE_WIN32) + , process_watcher_ (process_mgr_) +#endif /* ACE_WIN32 */ { } @@ -85,12 +123,27 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti if (this->debug_ > 1) ORBSVCS_DEBUG( (LM_DEBUG, "(%P|%t) ImR Activator: Contacting ImplRepoService...\n")); - // First, resolve the ImR, without this we can go no further - CORBA::Object_var obj = - orb_->resolve_initial_references ("ImplRepoService"); +#if defined (ACE_WIN32) + // On Windows the notify of a death of a child process requires the + // WFMO reactor which is not the default ORB reactor type so on + // Windows we are using a separate task to detect a child death + if (!this->process_watcher_.start ()) + { + if (this->debug_ > 1) + { + ORBSVCS_ERROR ((LM_ERROR, "(%P|%t) ImR Activator: Failed to start process watchdog\n")); + } + } + this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE); +#else this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, this->orb_->orb_core ()->reactor ()); +#endif /* ACE_WIN32 */ + + // First, resolve the ImR, without this we can go no further + CORBA::Object_var obj = + orb_->resolve_initial_references ("ImplRepoService"); locator_ = ImplementationRepository::Locator::_narrow (obj.in ()); @@ -103,11 +156,10 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti ior.in())); } - this->registration_token_ = - locator_->register_activator (name_.c_str (), activator); + this->registration_token_ = locator_->register_activator (name_.c_str (), activator); if (debug_ > 0) - ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR.\n")); + ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Registered with ImR\n")); return; } @@ -123,7 +175,7 @@ ImR_Activator_i::register_with_imr (ImplementationRepository::Activator_ptr acti } if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Not registered with ImR\n")); } int @@ -175,18 +227,6 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt if (this->debug_ > 0) ORBSVCS_DEBUG((LM_DEBUG, "(%P|%t) ImR Activator: Starting <%C>\n", name_.c_str ())); - // initialize our process manager. - // This requires a reactor that has signal handling. - ACE_Reactor *reactor = ACE_Reactor::instance (); - if (reactor != 0) - { - if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1) - { - ORBSVCS_ERROR_RETURN ((LM_ERROR, - "(%P|%t) ImR Activator: The ACE_Process_Manager didn't get initialized\n"), -1); - } - } - this->register_with_imr (activator.in ()); // no throw PortableServer::POAManager_var poaman = @@ -246,6 +286,11 @@ ImR_Activator_i::fini (void) if (debug_ > 1) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shutting down...\n")); +#if defined (ACE_WIN32) + // Stop our process watcher task + this->process_watcher_.stop (); +#endif /* ACE_WIN32 */ + this->process_mgr_.close (); this->root_poa_->destroy (1, 1); @@ -260,13 +305,13 @@ ImR_Activator_i::fini (void) { if (debug_ > 1) ORBSVCS_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR.\n"))); + ACE_TEXT ("(%P|%t) ImR Activator: COMM_FAILURE, unable to unregister from ImR\n"))); } catch (const CORBA::TRANSIENT&) { if (debug_ > 1) ORBSVCS_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR.\n"))); + ACE_TEXT ("(%P|%t) ImR Activator: TRANSIENT, unable to unregister from ImR\n"))); } catch (const CORBA::Exception& ex) { @@ -279,7 +324,7 @@ ImR_Activator_i::fini (void) this->orb_->destroy (); if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully.\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: Shut down successfully\n")); } catch (const CORBA::Exception& ex) { @@ -323,7 +368,9 @@ ImR_Activator_i::shutdown (bool signaled) if (signaled && this->in_upcall ()) { if (debug_ > 0) - ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall.\n")); + { + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) ImR Activator: ignoring signal during upcall\n")); + } return; } if (! CORBA::is_nil (this->locator_.in ()) && this->registration_token_ != 0) @@ -403,7 +450,7 @@ ImR_Activator_i::kill_server (const char* name, CORBA::Long lastpid, CORBA::Shor CORBA::Boolean ImR_Activator_i::still_alive (CORBA::Long pid) { - pid_t pt = static_cast<pid_t>(pid); + pid_t const pt = static_cast<pid_t>(pid); bool is_running = this->process_map_.find (pt) == 0; #if defined (ACE_WIN32) if (is_running) @@ -472,8 +519,8 @@ ImR_Activator_i::start_server(const char* name, if (debug_ > 0) { ORBSVCS_ERROR((LM_ERROR, - "(%P|%t) ImR Activator: Unique instance already running pid <%d>\n", - static_cast<int> (pid))); + "(%P|%t) ImR Activator: Unique instance for <%C> already running pid <%d>\n", + name, static_cast<int> (pid))); } char reason[32]; ACE_OS::snprintf (reason,32,"pid:%d",static_cast<int> (pid)); @@ -556,7 +603,7 @@ ImR_Activator_i::start_server(const char* name, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ImR Activator: Notifying ImR that ") - ACE_TEXT ("<%C> has started with pid <%d>.\n"), + ACE_TEXT ("<%C> has started with pid <%d>\n"), name, static_cast<int> (pid))); } try @@ -639,7 +686,7 @@ ImR_Activator_i::handle_exit (ACE_Process * process) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("Process %d exited with exit code %d, delay = %d\n"), + ACE_TEXT ("(%P|%t) ImR Activator: Process %d exited with exit code %d, delay = %d\n"), process->getpid (), process->return_value (), this->induce_delay_)); } @@ -649,16 +696,25 @@ ImR_Activator_i::handle_exit (ACE_Process * process) ACE_Time_Value dtv (0, this->induce_delay_ * 1000); pid_t const pid = process->getpid(); Act_token_type token = static_cast<Act_token_type>(pid); - r->schedule_timer (this, reinterpret_cast<void *>(token), dtv ); + r->schedule_timer (this, reinterpret_cast<void *>(token), dtv); } else { +#if defined (ACE_WIN32) + // On Windows this is called from the context of the watchdog thread + // so we are using the reactor here to trigger a thread switch so that + // handle_exit_i is called from the reactor thread + ACE_Reactor *r = this->orb_->orb_core ()->reactor (); + pid_t const pid = process->getpid (); + Act_token_type token = static_cast<Act_token_type>(pid); + r->schedule_timer (this, reinterpret_cast<void *>(token), ACE_Time_Value ()); +#else this->handle_exit_i (process->getpid()); +#endif /* ACE_WIN32 */ } return 0; } - int ImR_Activator_i::handle_timeout (const ACE_Time_Value &, const void * tok) { diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index 845588745b1..86d8c7b604c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -20,6 +20,9 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" #include "ace/SString.h" +#if defined (ACE_WIN32) +# include "ace/Task.h" +#endif /* ACE_WIN32 */ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -45,15 +48,28 @@ struct ACE_Equal_To_pid_t } }; - #if (ACE_SIZEOF_VOID_P == 8) typedef ACE_INT64 Act_token_type; #else typedef ACE_INT32 Act_token_type; #endif +#if defined (ACE_WIN32) class Active_Pid_Setter; +class Activator_Export Watchdog : public ACE_Task_Base +{ +public: + Watchdog (ACE_Process_Manager& procman); + virtual int svc (); + bool start (); + void stop (); +private: + bool stop_; + ACE_Process_Manager &procman_; +}; +#endif /* ACE_WIN32 */ + /** * @class ImR_Activator_i * @@ -66,7 +82,7 @@ class Active_Pid_Setter; class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::ActivatorExt, public ACE_Event_Handler { - public: +public: friend class Active_Pid_Setter; ImR_Activator_i (void); @@ -96,8 +112,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac /// Shutdown the orb. void shutdown (bool signaled); - private: - +private: int init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opts); void register_with_imr(ImplementationRepository::Activator_ptr activator); @@ -111,8 +126,7 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac bool in_upcall (void); - private: - +private: typedef ACE_Unbounded_Set<ACE_CString> UniqueServerList; typedef ACE_Hash_Map_Manager_Ex<pid_t, @@ -156,6 +170,9 @@ class Activator_Export ImR_Activator_i : public POA_ImplementationRepository::Ac bool detach_child_; pid_t active_check_pid_; +#if defined (ACE_WIN32) + Watchdog process_watcher_; +#endif /* ACE_WIN32 */ }; #if defined (ACE_WIN32) @@ -166,7 +183,6 @@ public: ~Active_Pid_Setter(); ImR_Activator_i &owner_; - }; #endif /* ACE_WIN32 */ diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index acbe55ff81a..83356ae9f9b 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -250,10 +250,12 @@ ImR_Locator_i::run (void) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("Implementation Repository: Running\n") ACE_TEXT ("\tPing Interval : %dms\n") + ACE_TEXT ("\tPing Timeout : %dms\n") ACE_TEXT ("\tStartup Timeout : %ds\n") ACE_TEXT ("\tPersistence : %s\n") ACE_TEXT ("\tMulticast : %C\n"), this->opts_->ping_interval ().msec (), + this->opts_->ping_timeout ().msec (), this->opts_->startup_timeout ().sec (), this->repository_->repo_mode (), (this->repository_->multicast () != 0 ? @@ -485,7 +487,7 @@ ImR_Locator_i::child_death_i (const char* name, int pid) if (debug_ > 1) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) ImR: Server <%C> has died with pid <%d>.\n"), + ACE_TEXT ("(%P|%t) ImR: Server <%C> has died with pid <%d>\n"), name, pid)); } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h index 0b5466381d0..f0c363f4c96 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h @@ -211,7 +211,6 @@ private: bool force); private: - static int debug_; // The class that handles the forwarding. @@ -333,7 +332,6 @@ private: Loc_Operation_Id op_id_; ImplementationRepository::AMH_AdministrationResponseHandler_var resp_; ImplementationRepository::AMH_AdministrationExtResponseHandler_var ext_; - }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index 87f6317cfe1..310e331b8a5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -12,8 +12,7 @@ LiveListener::LiveListener (const char *server) : server_ (server), - refcount_ (1), - lock_ () + refcount_ (1) { } @@ -30,13 +29,12 @@ LiveListener::server (void) const LiveListener * LiveListener::_add_ref (void) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); - ++this->refcount_; + int const refcount = ++this->refcount_; if (ImR_Locator_i::debug () > 5) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveListener::add_ref <%C> count <%d>\n"), - server_.c_str(), refcount_)); + server_.c_str(), refcount)); } return this; } @@ -44,17 +42,13 @@ LiveListener::_add_ref (void) void LiveListener::_remove_ref (void) { - int count = 0; - { - ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); - count = --this->refcount_; - if (ImR_Locator_i::debug () > 5) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveListener::remove_ref <%C> count <%d>\n"), - server_.c_str(), count)); - } - } + int const count = --this->refcount_; + if (ImR_Locator_i::debug () > 5) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveListener::remove_ref <%C> count <%d>\n"), + server_.c_str(), count)); + } if (count == 0) { delete this; @@ -147,8 +141,8 @@ LiveEntry::LiveEntry (LiveCheck *owner, if (ImR_Locator_i::debug () > 4) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::ctor server <%C> may_ping <%d> pid <%d>\n"), - server, may_ping, pid)); + ACE_TEXT ("(%P|%t) LiveEntry::ctor server <%C> status <%C> may_ping <%d> pid <%d>\n"), + server, status_name (this->liveliness_), may_ping, pid)); } } @@ -231,8 +225,8 @@ LiveEntry::status (void) const return LS_ALIVE; } - if ( this->liveliness_ == LS_ALIVE && - this->owner_->ping_interval() != ACE_Time_Value::zero ) + if (this->liveliness_ == LS_ALIVE && + this->owner_->ping_interval() != ACE_Time_Value::zero) { ACE_Time_Value now (ACE_OS::gettimeofday()); if (now >= this->next_check_) @@ -338,6 +332,12 @@ LiveEntry::pid (void) const } bool +LiveEntry::may_ping (void) const +{ + return this->may_ping_; +} + +bool LiveEntry::has_pid (int pid) const { return this->pid_ == 0 || pid == 0 || pid == this->pid_; @@ -346,23 +346,24 @@ LiveEntry::has_pid (int pid) const bool LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { + if (ImR_Locator_i::debug () > 4) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, status ") + ACE_TEXT ("<%C> listeners <%d> server <%C> pid <%d> want_reping <%d> may_ping <%d>\n"), + status_name (this->liveliness_), this->listeners_.size (), + this->server_.c_str(), this->pid_, want_reping, this->may_ping_)); + } + if (this->liveliness_ == LS_PING_AWAY || this->liveliness_ == LS_DEAD || this->listeners_.is_empty ()) { - if (ImR_Locator_i::debug () > 4) - { - ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveEntry::validate_ping, status ") - ACE_TEXT ("<%C> listeners <%d> server <%C> pid <%d>\n"), - status_name (this->liveliness_), this->listeners_.size (), - this->server_.c_str(), this->pid_)); - } return false; } - ACE_Time_Value now (ACE_OS::gettimeofday()); - ACE_Time_Value diff = this->next_check_ - now; - long msec = diff.msec(); + ACE_Time_Value const now (ACE_OS::gettimeofday()); + ACE_Time_Value const diff = this->next_check_ - now; + long const msec = diff.msec(); if (msec > 0) { if (!want_reping || this->next_check_ < next) @@ -404,7 +405,7 @@ LiveEntry::validate_ping (bool &want_reping, ACE_Time_Value& next) { this->liveliness_ = LS_TRANSIENT; } - ACE_Time_Value next (ms / 1000, (ms % 1000) * 1000); + ACE_Time_Value const next (ms / 1000, (ms % 1000) * 1000); this->next_check_ = now + next; if (ImR_Locator_i::debug () > 4) { @@ -457,6 +458,13 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa) } try { + if (ImR_Locator_i::debug () > 3) + { + ORBSVCS_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") + ACE_TEXT ("starting sendc_ping for server <%C>\n"), + this->server_.c_str())); + } this->ref_->sendc_ping (cb.in()); if (ImR_Locator_i::debug () > 3) { @@ -472,16 +480,15 @@ LiveEntry::do_ping (PortableServer::POA_ptr poa) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveEntry::do_ping, ") - ACE_TEXT ("sendc_ping for server <%C> threw <%C>\n"), - this->server_.c_str(), ex._name())); + ACE_TEXT ("sendc_ping for server <%C> threw <%C> marking as dead\n"), + this->server_.c_str(), ex._info ().c_str ())); } + this->release_callback (); this->status (LS_DEAD); } } //--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- - PingReceiver::PingReceiver (LiveEntry *entry, PortableServer::POA_ptr poa) :poa_ (PortableServer::POA::_duplicate(poa)), entry_ (entry) @@ -519,7 +526,7 @@ PingReceiver::cancel (void) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) PingReceiver::cancel caught <%C>\n"), - ex._name ())); + ex._info ().c_str ())); } } } @@ -692,7 +699,7 @@ LiveCheck::LiveCheck () token_ (100), handle_timeout_busy_ (0), want_timeout_ (false), - deferred_timeout_ (0,0) + deferred_timeout_ (ACE_Time_Value::zero) { } @@ -797,8 +804,8 @@ LiveCheck::handle_timeout (const ACE_Time_Value &, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::handle_timeout(%d)") - ACE_TEXT (", ping skipped for server <%C>\n"), - token, entry->server_name ())); + ACE_TEXT (", ping skipped for server <%C> may_ping <%d>\n"), + token, entry->server_name (), entry->may_ping ())); } } } @@ -846,8 +853,8 @@ LiveCheck::add_server (const char *server, { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::add_server <%C> ") - ACE_TEXT ("running <%d> pid <%d>\n"), - server, this->running_, pid)); + ACE_TEXT ("may_ping <%d> running <%d> pid <%d>\n"), + server, may_ping, this->running_, pid)); } if (!this->running_) @@ -915,7 +922,7 @@ LiveCheck::remove_server (const char *server, int pid) if (ImR_Locator_i::debug () > 0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) LiveCheck::remove_server removing <%C> pid <%d> entry pid <%d> status <%C>\n "), + ACE_TEXT ("(%P|%t) LiveCheck::remove_server removing <%C> pid <%d> entry pid <%d> status <%C>\n"), server, pid, entry->pid (), LiveEntry::status_name (entry->status ()))); } if (entry_map_.unbind (s, entry) == 0) @@ -1191,7 +1198,7 @@ LiveCheck::schedule_ping (LiveEntry *entry) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) LiveCheck::schedule_ping (%d),") - ACE_TEXT (" delay = %d,%d\n"), + ACE_TEXT (" delay <%d,%d>\n"), this->token_, delay.sec(), delay.usec())); } this->reactor()->schedule_timer (this, diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index fa9daf3c5ce..6437f7c289c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -22,6 +22,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Intrusive_Ref_Count_Handle_T.h" +#if defined (ACE_HAS_CPP11) +# include <atomic> +#else +# include "ace/Atomic_Op.h" +#endif /* ACE_HAS_CPP11 */ class LiveCheck; class LiveEntry; @@ -81,7 +86,7 @@ class Locator_Export LiveListener /// is received. Returns true if finished listening virtual bool status_changed (LiveStatus status) = 0; - /// accessor for the server name. Used by the LiveCheck to associate a listener + /// Accessor for the server name. Used by the LiveCheck to associate a listener const char *server (void) const; LiveListener *_add_ref (void); @@ -91,8 +96,11 @@ class Locator_Export LiveListener ACE_CString server_; private: - int refcount_; - TAO_SYNCH_MUTEX lock_; +#if defined (ACE_HAS_CPP11) + std::atomic<int> refcount_; +#else + ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> refcount_; +#endif /* ACE_HAS_CPP11 */ }; typedef TAO_Intrusive_Ref_Count_Handle<LiveListener> LiveListener_ptr; @@ -140,6 +148,7 @@ class Locator_Export LiveEntry void set_pid (int pid); bool has_pid (int pid) const; int pid (void) const; + bool may_ping (void) const; private: LiveCheck *owner_; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 4f66897ae24..d691b4e8495 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -10,6 +10,7 @@ #include "ace/Arg_Shifter.h" #include "orbsvcs/Log_Macros.h" #include "ace/OS_NS_strings.h" +#include "ace/OS_NS_time.h" #if defined (ACE_WIN32) static const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE; @@ -261,7 +262,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) return -1; } this->ping_interval_ = - ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ())); + ACE_Time_Value (0, ACE_U_ONE_SECOND_IN_MSECS * ACE_OS::atoi (shifter.get_current ())); } else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("-n")) == 0) @@ -276,7 +277,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) return -1; } this->ping_timeout_ = - ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ())); + ACE_Time_Value (0, ACE_U_ONE_SECOND_IN_MSECS * ACE_OS::atoi (shifter.get_current ())); } else if (ACE_OS::strcasecmp (shifter.get_current (), ACE_TEXT ("--ftendpoint")) == 0) @@ -305,7 +306,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[]) return -1; } this->ft_update_delay_ = - ACE_Time_Value (0, 1000 * ACE_OS::atoi (shifter.get_current ())); + ACE_Time_Value (0, ACE_U_ONE_SECOND_IN_MSECS * ACE_OS::atoi (shifter.get_current ())); } else { @@ -388,14 +389,16 @@ Options::print_usage (void) const ACE_TEXT (" --backup Replicate the ImplRepo as the backup ImR\n") ACE_TEXT (" -r Use the registry for storing/loading settings\n") ACE_TEXT (" -s Run as a service\n") - ACE_TEXT (" -t secs Server startup timeout.(Default = 60s)\n") - ACE_TEXT (" -v msecs Server verification interval.(Default = 10000ms)\n") - ACE_TEXT (" -n msecs Ping request timeout.(Default = 10ms)\n") + ACE_TEXT (" -t secs Server startup timeout.(Default = %ds)\n") + ACE_TEXT (" -v msecs Server verification interval.(Default = %dms)\n") + ACE_TEXT (" -n msecs Ping request timeout.(Default = %dms)\n") ACE_TEXT (" -i Ping servers started without activators too.\n") ACE_TEXT (" --lockout Prevent excessive restart attempts until manual reset.\n") ACE_TEXT (" --UnregisterIfAddressReused,\n") - ACE_TEXT (" -u Unregister server if its endpoint is used by another\n") - )); + ACE_TEXT (" -u Unregister server if its endpoint is used by another\n"), + DEFAULT_START_TIMEOUT, + DEFAULT_PING_INTERVAL * ACE_U_ONE_SECOND_IN_MSECS, + DEFAULT_PING_TIMEOUT * ACE_U_ONE_SECOND_IN_MSECS)); } int diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp index dc4017895ee..aeb716fbab3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp @@ -157,7 +157,7 @@ Replicator::svc (void) { ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Replicator::svc caught %C\n"), - ex._name ())); + ex._info ().c_str ())); } } return 0; diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README index cd79e15c245..0ec6ccb78d1 100644 --- a/TAO/orbsvcs/Naming_Service/README +++ b/TAO/orbsvcs/Naming_Service/README @@ -14,7 +14,7 @@ The following describes how to run the TAO Naming Service. [-b base_address] [-d ] [-f persistence_file_name] - [-m (1=enable multicast responses,0=disable(default)] + [-m (1=enable multicast responses,0=disable(default)] [-n number_of_threads] [-o ior_output_file] [-p pid_file_name] @@ -22,7 +22,7 @@ The following describes how to run the TAO Naming Service. [-s context_size] [-t time] [-u directory] - [-z time] + [-z time] 2. Optional Command-line Arguments @@ -49,15 +49,15 @@ The following describes how to run the TAO Naming Service. option, Naming Service is started in non-persistent mode. - -m <0|1> + -m <0|1> TAO offers a simple, very non-standard method for clients to discover the initial reference for the Naming Service. However, since it can be inadequate and cause - unexpected results if, for example, there are multiple - naming services running on the network, the DEFAULT - behavior is for the Naming Service to NOT RESPOND to - such multicast queries (use the Interoperable Naming - Service bootstrap options instead). + unexpected results if, for example, there are multiple + naming services running on the network, the DEFAULT + behavior is for the Naming Service to NOT RESPOND to + such multicast queries (use the Interoperable Naming + Service bootstrap options instead). -n number_of_threads Specify a number of threads to be used to run the ORB. diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc index 2be113473a0..d8f64729057 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc +++ b/TAO/orbsvcs/examples/ImR/Advanced/Advanced.mpc @@ -15,8 +15,6 @@ project(*Manager): orbsvcsexe, portableserver { ManagerC.cpp } Documentation_Files { - Advanced.mpc - run_test.pl README drivers/* } diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index d4d7c712d37..4357cc56362 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -41,26 +41,21 @@ public: // Run the test protected: - CosNotifyChannelAdmin::ProxyID proxy_supplier_id_; // The proxy_supplier id. // = Methods - // Destructor - // = NotifyPublish method - virtual void offer_change ( + virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods -virtual void push (const CORBA::Any &event); + virtual void push (const CORBA::Any &event); - virtual void disconnect_push_consumer ( - ); + virtual void disconnect_push_consumer (); private: CORBA::ULong event_count_; diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index d96afc1c168..524e2e5ab0f 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -101,12 +101,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 5035a351653..6723882544d 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -169,16 +169,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; /*****************************************************************/ @@ -225,12 +222,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; #endif /* NOTIFY_FILTER_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 2e0a6b1227a..fffb548b2f1 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -58,8 +58,7 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier (void); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h index 1e1ba4a6a2f..a09e939b37f 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h @@ -159,16 +159,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; /*****************************************************************/ @@ -212,12 +209,10 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier ( - ); + virtual void disconnect_structured_push_supplier (); }; #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index 8d078171772..131c4b81deb 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -60,16 +60,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); // = Data members diff --git a/TAO/orbsvcs/examples/ORT/run_test.pl b/TAO/orbsvcs/examples/ORT/run_test.pl index 0c46a3836d4..ba0fc515664 100755 --- a/TAO/orbsvcs/examples/ORT/run_test.pl +++ b/TAO/orbsvcs/examples/ORT/run_test.pl @@ -50,9 +50,9 @@ if ($^O eq "MSWin32") { $exec_extn=".exe"; } -$tao_ifr = "../../../../bin/tao_ifr"; +$tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr"; if (! -e $tao_ifr . $exec_extn ) { - $tao_ifr = "../../../IFR_Service/tao_ifr"; + $tao_ifr = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr"; if (! -e $tao_ifr . $exec_extn ) { print STDERR "ERROR: tao_ifr compiler not found.\n"; exit 1; @@ -72,7 +72,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } $TI = $ti->CreateProcess ($tao_ifr); -$IFR = $ifr->CreateProcess ("../../IFR_Service/tao_ifr_service", +$IFR = $ifr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $ifr_ifriorfile"); $GWS = $gws->CreateProcess ("gateway_server", "-o $gws_gwsiorfile ". diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h index 181db2a5943..08c2d6bfe6a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h @@ -21,24 +21,21 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class AMI_Primary_Replication_Strategy; class Update_Manager; -class UpdateableHandler : public POA_FTRT::AMI_UpdateableHandler +class UpdateableHandler : public POA_FTRT::AMI_UpdateableHandler { public: - UpdateableHandler(AMI_Primary_Replication_Strategy* strategy); - ~UpdateableHandler(); + UpdateableHandler(AMI_Primary_Replication_Strategy* strategy); + ~UpdateableHandler(); - FTRT::AMI_UpdateableHandler_ptr activate( - Update_Manager* mgr, int id, - PortableServer::ObjectId& oid); - typedef void (Update_Manager::*Handler)(int); + FTRT::AMI_UpdateableHandler_ptr activate( + Update_Manager* mgr, int id, + PortableServer::ObjectId& oid); + typedef void (Update_Manager::*Handler)(int); - void dispatch(Handler handler) ; + void dispatch(Handler handler) ; - virtual void set_update ( - ); - virtual void set_update_excep ( - ::Messaging::ExceptionHolder * excep_holder - ); + virtual void set_update (); + virtual void set_update_excep (::Messaging::ExceptionHolder * excep_holder); private: AMI_Primary_Replication_Strategy* strategy_; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 644bbc5af99..7e6bd0996b3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -58,20 +58,17 @@ TAO_ComponentRepository_i::create_servants_and_poas ( // Request Processing Policy. policies[2] = this->root_poa_->create_request_processing_policy ( - PortableServer::USE_DEFAULT_SERVANT - ); + PortableServer::USE_DEFAULT_SERVANT); // Servant Retention Policy. policies[3] = this->root_poa_->create_servant_retention_policy ( - PortableServer::NON_RETAIN - ); + PortableServer::NON_RETAIN); // Id Uniqueness Policy. policies[4] = this->root_poa_->create_id_uniqueness_policy ( - PortableServer::MULTIPLE_ID - ); + PortableServer::MULTIPLE_ID); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 777aaef1614..bec091bc8aa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Naming/Naming_Server.h" -// Placing the include of Messanging.h at this point +// Placing the include of Messaging.h at this point // allows for successful compilation if versioned namespaces // are enabled. #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index 0d6dc11b5aa..a9834a5c602 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -31,8 +31,8 @@ Standard_Event_Persistence::get_factory () { ACE_NEW_NORETURN ( this->factory_, - Standard_Event_Persistence_Factory () - ); + Standard_Event_Persistence_Factory ()); + if (this->factory_ != 0) { if (!this->factory_->open (this->filename_.c_str ())) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index d2f01c4fe3c..042cb69528b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -129,31 +129,24 @@ namespace TAO virtual void register_factory ( const char * role, const char * type_id, - const PortableGroup::FactoryInfo & factory_info - ); + const PortableGroup::FactoryInfo & factory_info); virtual void unregister_factory ( const char * role, - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); - virtual void unregister_factory_by_role ( - const char * role - ); + virtual void unregister_factory_by_role (const char * role); virtual void unregister_factory_by_location ( - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); virtual ::PortableGroup::FactoryInfos * list_factories_by_role ( const char * role, - CORBA::String_out type_id - ); + CORBA::String_out type_id); virtual ::PortableGroup::FactoryInfos * list_factories_by_location ( - const PortableGroup::Location & location - ); + const PortableGroup::Location & location); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 50ca6ae1667..4d5b68919d8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -299,7 +299,7 @@ TAO::PG_Group_Factory::groups_at_location ( const PortableGroup::Location & the_location) { Group_Map & group_map = this->get_group_map (); - size_t upper_limit = group_map.current_size (); + CORBA::ULong const upper_limit = static_cast<CORBA::ULong> (group_map.current_size ()); PortableGroup::ObjectGroups * result = 0; ACE_NEW_THROW_EX ( result, @@ -308,7 +308,7 @@ TAO::PG_Group_Factory::groups_at_location ( result->length(upper_limit); - size_t group_count = 0; + CORBA::ULong group_count = 0; for (Group_Map_Iterator it = group_map.begin (); it != group_map.end (); ++it) @@ -328,7 +328,7 @@ PortableGroup::ObjectGroups * TAO::PG_Group_Factory::all_groups (void) { Group_Map & group_map = this->get_group_map (); - size_t upper_limit = group_map.current_size (); + CORBA::ULong const upper_limit = static_cast<CORBA::ULong> (group_map.current_size ()); PortableGroup::ObjectGroups * result = 0; ACE_NEW_THROW_EX ( result, @@ -337,7 +337,7 @@ TAO::PG_Group_Factory::all_groups (void) result->length(upper_limit); - size_t group_count = 0; + CORBA::ULong group_count = 0; for (Group_Map_Iterator it = group_map.begin (); it != group_map.end (); ++it) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 266859dfd9f..566182384dd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -601,7 +601,7 @@ TAO::PG_Object_Group_Storable::write (TAO::Storable_Base & stream) stream << properties_cdr; ///// members_ ///// - int num_members = this->members_.current_size (); + size_t const num_members = this->members_.current_size (); stream << num_members; for (MemberMap_Iterator it = this->members_.begin (); it != this->members_.end (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp index 858e3b1e703..590c5faa2d7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp @@ -40,9 +40,9 @@ void TAO_PG::Properties_Encoder::encode ( PortableGroup::Properties * property_set) const { ACE_ASSERT (property_set != 0); - size_t count = values_.size(); + CORBA::ULong const count = static_cast<CORBA::ULong> (values_.size()); property_set->length(count); - for( size_t nItem = 0; nItem < count; ++nItem ) + for( CORBA::ULong nItem = 0; nItem < count; ++nItem ) { const NamedValue & nv = values_[nItem]; PortableGroup::Property & property = (*property_set)[nItem]; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index e074d429f4f..bf18a767a8a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -54,8 +54,8 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); - size_t count = property_set.length (); - for (size_t nItem = 0; nItem < count; ++nItem) + CORBA::ULong const count = property_set.length (); + for (CORBA::ULong nItem = 0; nItem < count; ++nItem) { const PortableGroup::Property & property = property_set[nItem]; const CosNaming::Name & nsName = property.nam; @@ -112,8 +112,8 @@ void TAO::PG_Property_Set::clear () void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_set) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); - size_t count = property_set.length (); - for (size_t nItem = 0; nItem < count; ++nItem) + CORBA::ULong const count = property_set.length (); + for (CORBA::ULong nItem = 0; nItem < count; ++nItem) { const PortableGroup::Property & property = property_set[nItem]; const CosNaming::Name & nsName = property.nam; @@ -170,9 +170,9 @@ void TAO::PG_Property_Set::export_properties(PortableGroup::Properties & propert ValueMap merged_values; this->merge_properties (merged_values); - property_set.length (merged_values.current_size ()); + property_set.length (static_cast<CORBA::ULong> (merged_values.current_size ())); - size_t pos = 0; + CORBA::ULong pos = 0; for (ValueMapIterator it = merged_values.begin (); it != merged_values.end (); ++it) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp index 54a4d77aad0..869c727e0ed 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp @@ -38,7 +38,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, { // Let the caller use the first part of this // message block. - block.iov_len = max_length; + block.iov_len = static_cast<u_long> (max_length); block.iov_base = this->iov_[this->iov_index_].iov_base; // Break up the block. @@ -57,7 +57,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, if (this->iov_len_left_ <= max_length) { // Return everything that's left in the block. - block.iov_len = this->iov_len_left_; + block.iov_len = static_cast<u_long> (this->iov_len_left_); block.iov_base = this->iov_ptr_; // Go to the next block. @@ -71,7 +71,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, else { // Split a little more off the block. - block.iov_len = max_length; + block.iov_len = static_cast<u_long> (max_length); block.iov_base = this->iov_ptr_; this->iov_len_left_ -= max_length; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index f41d5f3116a..5090520c7c5 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -94,7 +94,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) { // The following is a selective reproduction of TAO_Profile::decode - CORBA::ULong encap_len = cdr.length (); + CORBA::ULong const encap_len = static_cast<CORBA::ULong> (cdr.length ()); // Read and verify major, minor versions, ignoring profiles // whose versions we don't understand. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp index f1ef71572b6..08b2b33d1b0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp @@ -6,10 +6,6 @@ #include "EC_Destroyer.h" -#if !defined(__ACE_INLINE__) -#include "EC_Destroyer.inl" -#endif /* __ACE_INLINE__ */ - EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec) : ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h index 88e7c470977..f4078e534df 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h @@ -38,8 +38,4 @@ private: RtecEventChannelAdmin::EventChannel_var ec_; }; -#if defined(__ACE_INLINE__) -#include "EC_Destroyer.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_PERF_RTEC_EC_DESTROYER_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl deleted file mode 100644 index 5af0172c245..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.inl +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file EC_Destroyer.inl - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl deleted file mode 100644 index a568d801898..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.inl +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file Low_Priority_Setup.inl - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp index e572d42ac75..00786c73bde 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp @@ -9,10 +9,6 @@ #include "RIR_Narrow.h" #include "tao/Policy_ManagerC.h" -#if !defined(__ACE_INLINE__) -#include "PriorityBand_Setup.inl" -#endif /* __ACE_INLINE__ */ - PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, const RTCORBA_Setup &rtcorba_setup) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h index 62889e0527c..f0f23d54db3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h @@ -35,8 +35,4 @@ public: ~PriorityBand_Setup (void); }; -#if defined(__ACE_INLINE__) -#include "PriorityBand_Setup.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_PERF_RTEC_PRIORITYBAND_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl deleted file mode 100644 index 54a3ef0e5de..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.inl +++ /dev/null @@ -1,6 +0,0 @@ -/** - * @file PriorityBand_Setup.inl - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ - diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h index aeb1f8daf2f..c817a22f08c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h @@ -10,7 +10,6 @@ #include "rtec_perf_export.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" -#include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,8 +37,7 @@ public: RTCORBA::Priority process_priority (void) const; private: - void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane - ); + void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane); private: RTCORBA::PriorityMappingManager_var priority_mapping_manager_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index da170a07a03..e037fbf7d54 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -21,19 +21,11 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, : use_rt_corba_ (use_rt_corba) , syncscope_setup_ (orb) { - if (use_rt_corba) { ACE_auto_ptr_reset (this->rtcorba_setup_, new RTCORBA_Setup (orb, rt_class, nthreads)); - -#if 0 - ACE_auto_ptr_reset (this->priorityband_setup_, - new PriorityBand_Setup (orb, - *this->rtcorba_setup_)); - -#endif /* 0 */ } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h index bf6044196ba..82ee76d81fa 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h @@ -43,7 +43,6 @@ private: int use_rt_corba_; auto_ptr<RTCORBA_Setup> rtcorba_setup_; - auto_ptr<PriorityBand_Setup> priorityband_setup_; SyncScope_Setup syncscope_setup_; }; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 2d582b4de62..865bc73a6f2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -12,6 +12,7 @@ #include "orbsvcs/Event/EC_RTCORBA_Factory.h" #include "ace/Dynamic_Service.h" +#include "ace/Auto_Ptr.h" TAO_EC_Event_Channel * RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa, diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp index b897fc4c96d..a75014c780a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp @@ -8,10 +8,6 @@ #include "RIR_Narrow.h" #include "tao/AnyTypeCode/Any.h" -#if !defined(__ACE_INLINE__) -#include "SyncScope_Setup.inl" -#endif /* __ACE_INLINE__ */ - SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb, Messaging::SyncScope value) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h index 5f4d1b441f5..75689632305 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h @@ -40,8 +40,4 @@ private: Messaging::SyncScope value); }; -#if defined(__ACE_INLINE__) -#include "SyncScope_Setup.inl" -#endif /* __ACE_INLINE__ */ - #endif /* TAO_PERF_RTEC_SYNCSCOPE_SETUP_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl deleted file mode 100644 index efa4eba2fc4..00000000000 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.inl +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @file SyncScope_Setup.inl - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl index f830392f7e5..4d864c5e00a 100755 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl @@ -29,7 +29,7 @@ my $iorbase = "test.ior"; my $server_iorfile = $server->LocalFile ($iorbase); $server->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$orb_port -o $server_iorfile"); $CL = $client->CreateProcess ("TimeServer", "-ORBInitRef NameService=corbaloc:iiop:$host:$orb_port/NameService"); diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl index 568ac14f54d..233a392ec27 100755 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl @@ -33,7 +33,7 @@ $CLI = $ns->CreateProcess ("client"); # Fire up the Name Service # -$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBDebugLevel $debug_level ". "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl index fea15548302..e4aec517a7e 100755 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl @@ -12,7 +12,7 @@ $status = 0; my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp"); # The location of the IFR_Service binary -my $ifr_service_bin = "../../IFR_Service"; +my $ifr_service_bin = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service"; # The location of the tao_ifr utility binary my $tao_ifr_bin = "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl index f394dcfec01..2a86a2bab55 100755 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl @@ -23,7 +23,7 @@ my $activator = PerlACE::TestTarget::create_target (4) || die "Create target 4 f my $tao_imr = PerlACE::TestTarget::create_target (5) || die "Create target 5 failed\n"; # The location of the implementation repository binaries -my $imr_bin_path = "../../ImplRepo_Service"; +my $imr_bin_path = "$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service"; # The location of the tao_imr IMR utility my $tao_imr_bin_path = "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl index 66dd0f0b1c1..29cf0f69e46 100755 --- a/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1436_Regression/run_test.pl @@ -20,7 +20,7 @@ my $ifr_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 my $tao_ifr = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; # The location of the implementation repository binaries -my $ifr_bin_path = "../../IFR_Service"; +my $ifr_bin_path = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service"; # The location of the tao_ifr IFR utility my $tao_ifr_bin_path = "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl index 45884aada56..d67223afd2b 100755 --- a/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1437_Regression/run_test.pl @@ -38,11 +38,11 @@ $tao_imr->DeleteFile ($imr_ior); # Run the IMR locator on a fixed port my $locator_port = $locator->RandomPort(); -$LC = $locator->CreateProcess ("../../ImplRepo_Service/tao_imr_locator", +$LC = $locator->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator", "-ORBdebuglevel $debug_level -o $locator_imr_iorfile ". "-ORBEndpoint iiop://:$locator_port"); -$AC = $activator->CreateProcess ("../../ImplRepo_Service/tao_imr_activator", +$AC = $activator->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator", "-ORBdebuglevel $debug_level -o $activator_iorfile ". "-ORBInitRef ImplRepoService=file://$activator_imr_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl index 63d205ad449..a2381d99152 100755 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/run_test.pl @@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("testclient", "-ORBInitRef InterfaceRepository=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl index cdb00ddac27..3b91530ebb7 100755 --- a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl @@ -35,7 +35,7 @@ my $ns_list_iorfile = $ns_list->LocalFile ($iorbase); $ns_service->DeleteFile($iorbase); $ns_list->DeleteFile($iorbase); -$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/tao_cosnaming", +$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $ns_service_iorfile ". "-ORBObjRefStyle URL -ORBEndpoint shmiop:// -ORBSvcConfDirective ". "\"dynamic SHMIOP_Factory Service_Object ". diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl index 630ddffee67..0732abd4b2b 100755 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl @@ -49,9 +49,9 @@ $ns2->DeleteFile ($ns2_ior); $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("client", ""); -$NS1 = $ns1->CreateProcess("../../Naming_Service/tao_cosnaming", +$NS1 = $ns1->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndPoint $ns_endpoint1 -o $ns1_iorfile -m 0"); -$NS2 = $ns2->CreateProcess("../../Naming_Service/tao_cosnaming", +$NS2 = $ns2->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndPoint $ns_endpoint2 -o $ns2_iorfile -m 0"); # Run two Naming Servers diff --git a/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl index 95a852b7261..bcacbfc357a 100755 --- a/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_4118_Regression/run_test.pl @@ -10,7 +10,6 @@ use Cwd; ## Save the starting directory $status = 0; -$startdir = getcwd(); my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; @@ -47,7 +46,7 @@ sub cleanup sub start_name_server { my $args = "-ORBCollocation no -ORBListenEndpoints iiop://$hostname:$ns_orb_port -o $test_iorfile -n 5 -u $persistence_dir"; - my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $SV = $test->CreateProcess ("$prog", "$args"); $SV->Spawn (); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index aea88ee2344..554e85b8f78 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -30,11 +30,11 @@ $server3->DeleteFile ($naming_ior); $client->DeleteFile ($naming_ior); -$SV1 = $server1->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBNameServicePort $port " . "-o $server1_naming_ior"); -$SV2 = $server2->CreateProcess ("../../Event_Service/tao_rtevent", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent", "-ORBInitRef NameService=file://$server2_naming_ior"); $SV3 = $server3->CreateProcess ("ECM_Supplier", diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index 3add0becd10..619b8831e2f 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("EC_Multiple", diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index fbcff3492c0..19237263edc 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -64,10 +64,10 @@ if ($T_status != 0) { print STDERR "================ Remote test\n"; -$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent", +$ES = $es->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent", "-ORBInitRef NameService=file://$es_nsiorfile ". "-ORBSvcConf $es_ecconffile ". "-s local"); diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl index 45c5ec09f4e..38d88e43283 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl @@ -40,10 +40,10 @@ $sup2->DeleteFile ($nsiorfile); print STDERR "================ Overflow test\n"; -$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent", +$ES = $es->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent", "-ORBInitRef NameService=file://$es_nsiorfile ". " -ORBSvcConf $es_ecmtconffile ". " -s local"); diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc index ae1ffb5ac3d..77779743c07 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc +++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc @@ -30,15 +30,6 @@ project(*Server): taoserver, fault_tolerance, orbsvcsexe, avoids_minimum_corba, Documentation_Files { README - FT_App.mpc - run_test_basic.pl // can the client talk to the server - run_test_detector.pl // does a detector notice a server fault - run_test_notifier.pl // does the notification get to an analyzer - run_test_fault_consumer.pl // Is the notification analyzed correctly - run_test_registry.pl // does the stand-along factory registry work - run_test_rmregistry.pl // does the factory registry in the RM work - run_test_replication_mgr.pl // - run_test_demo.pl // test it all together } IDL_Files { diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc index 22dcff47246..5fba5c53953 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/FaultTolerant.mpc @@ -11,11 +11,11 @@ project(*server): ftnaming { after += *idl exename = server Source_Files { - TestC.cpp - TestS.cpp - server.cpp - LB_server.cpp - Basic.cpp + TestC.cpp + TestS.cpp + server.cpp + LB_server.cpp + Basic.cpp } IDL_Files { } diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README index 9ee3791304a..0b5479f17dd 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README @@ -1,5 +1,3 @@ - - This program tests the following fault tolerant naming service implementation use cases: @@ -13,7 +11,6 @@ use cases: 3) Equivalence: Validate that a client can seamlessly invoke naming operations on either server instance. - ================================================================================ Failover Test ================================================================================ @@ -24,48 +21,48 @@ Failover Test 1) Create empty NameService and GroupService directories - cd $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant - mkdir NameService - mkdir GroupService + cd $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant + mkdir NameService + mkdir GroupService 2) Start primary tao_ft_naming process - $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming --primary \ - -ORBListenEndPoints iiop://<hostname>:<port1> \ - -m 0 \ - -r NameService \ - -v GroupService & + $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming --primary \ + -ORBListenEndPoints iiop://<hostname>:<port1> \ + -m 0 \ + -r NameService \ + -v GroupService & 3) Start backup tao_ft_naming process - $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming --backup \ - -ORBListenEndPoints iiop://<hostname>:<port2> \ - -m 0 \ - -c $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ - -g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ - -r NameService \ - -v GroupService & + $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming --backup \ + -ORBListenEndPoints iiop://<hostname>:<port2> \ + -m 0 \ + -c $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ + -g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ + -r NameService \ + -v GroupService & 4) Terminate primary tao_ft_naming process 5) Run client with failover argument - client --failover \ - -p file:///$TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ - -r file://$TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ - -b 4 -d 4 + client --failover \ + -p file:///$TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ + -r file://$TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ + -b 4 -d 4 - ============================================================================== - Example Output: - ============================================================================== - INFO: Failover Name Test OK - INFO: nm1ref: file:///tmp/ramdisk/tmp/nm.ior - INFO: Object Group Found In Repository - INFO: Failover ObjectGroup Test OK +============================================================================== +Example Output: +============================================================================== +INFO: Failover Name Test OK +INFO: nm1ref: file:///tmp/ramdisk/tmp/nm.ior +INFO: Object Group Found In Repository +INFO: Failover ObjectGroup Test OK 6) Cleanup - rm -rf NameService - rm -rf GroupService +rm -rf NameService +rm -rf GroupService ================================================================================ Persistence Test @@ -76,93 +73,91 @@ Persistence Test 1) Create empty NameService and GroupService directories - cd $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant - mkdir NameService - mkdir GroupService + cd $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant + mkdir NameService + mkdir GroupService 2) Start tao_ft_naming - $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ - -ORBListenEndPoints iiop://<hostname>:<port1> \ - -g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ - -o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ - -v GroupService \ - -u NameService & + $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ + -ORBListenEndPoints iiop://<hostname>:<port1> \ + -g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ + -o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ + -v GroupService \ + -u NameService & 3) Start test object server - server -ORBDefaultInitRef corbaloc:iiop:<hostname>:<port1> \ - -o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/srv.ior & + server -ORBDefaultInitRef corbaloc:iiop:<hostname>:<port1> \ + -o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/srv.ior & 4) Run the test client with the persistence and create arguments - client --persistence --create \ - -p corbaloc:iiop:<hostname>:<port1>/NameService \ - -r corbaloc:iiop:<hostname>:<port1>/NamingManager \ - -b 4 -d 4 - - ============================================================================== - Example Output: - ============================================================================== - INFO: Persistence Creation Name Test OK - INFO: Object Group BasicGroup Found In Repository - INFO: validating group member location1 - INFO: object group member at location1 reports location1 - INFO: validating group member location2 - INFO: object group member at location2 reports location2 - INFO: validating group member location3 - INFO: object group member at location3 reports location3 - INFO: validating group member location4 - INFO: object group member at location4 reports location4 - INFO: validating group member location5 - INFO: object group member at location5 reports location5 - INFO: validating group member location6 - INFO: object group member at location6 reports location6 - INFO: Persistence Creation ObjectGroup Test OK - + client --persistence --create \ + -p corbaloc:iiop:<hostname>:<port1>/NameService \ + -r corbaloc:iiop:<hostname>:<port1>/NamingManager \ + -b 4 -d 4 + +============================================================================== +Example Output: +============================================================================== +INFO: Persistence Creation Name Test OK +INFO: Object Group BasicGroup Found In Repository +INFO: validating group member location1 +INFO: object group member at location1 reports location1 +INFO: validating group member location2 +INFO: object group member at location2 reports location2 +INFO: validating group member location3 +INFO: object group member at location3 reports location3 +INFO: validating group member location4 +INFO: object group member at location4 reports location4 +INFO: validating group member location5 +INFO: object group member at location5 reports location5 +INFO: validating group member location6 +INFO: object group member at location6 reports location6 +INFO: Persistence Creation ObjectGroup Test OK 5) Terminate tao_ft_naming and then restart it with the original arguments - kill `pidof $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming` + kill `pidof $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming` - $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ - -ORBListenEndPoints iiop://<hostname>:<port1> \ - -g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ - -o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ - -v GroupService \ - -u NameService & + $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ + -ORBListenEndPoints iiop://<hostname>:<port1> \ + -g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \ + -o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \ + -v GroupService \ + -u NameService & 6) Now run the test client with the persistence and valdiate arguments - client --persistence --validate \ - -p corbaloc:iiop:<hostname>:<port1>/NameService \ - -r corbaloc:iiop:<hostname>:<port1>/NamingManager \ - -b 4 -d 4 - - ============================================================================== - Example Output: - ============================================================================== - INFO: Persistence Validation Name Test OK - INFO: Object Group BasicGroup Found In Repository - INFO: validating group member location1 - INFO: object group member at location1 reports location1 - INFO: validating group member location2 - INFO: object group member at location2 reports location2 - INFO: validating group member location3 - INFO: object group member at location3 reports location3 - INFO: validating group member location4 - INFO: object group member at location4 reports location4 - INFO: validating group member location5 - INFO: object group member at location5 reports location5 - INFO: validating group member location6 - INFO: object group member at location6 reports location6 - INFO: Persistence Validation ObjectGroup Test OK + client --persistence --validate \ + -p corbaloc:iiop:<hostname>:<port1>/NameService \ + -r corbaloc:iiop:<hostname>:<port1>/NamingManager \ + -b 4 -d 4 + +============================================================================== +Example Output: +============================================================================== +INFO: Persistence Validation Name Test OK +INFO: Object Group BasicGroup Found In Repository +INFO: validating group member location1 +INFO: object group member at location1 reports location1 +INFO: validating group member location2 +INFO: object group member at location2 reports location2 +INFO: validating group member location3 +INFO: object group member at location3 reports location3 +INFO: validating group member location4 +INFO: object group member at location4 reports location4 +INFO: validating group member location5 +INFO: object group member at location5 reports location5 +INFO: validating group member location6 +INFO: object group member at location6 reports location6 +INFO: Persistence Validation ObjectGroup Test OK 7) Cleanup - rm -rf NameService - rm -rf GroupService - + rm -rf NameService + rm -rf GroupService ================================================================================ Redundant Equivalancy Test @@ -174,61 +169,60 @@ Redundant Equivalancy Test 1) Create empty NameService and GroupService directories - cd $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant - mkdir NameService - mkdir GroupService + cd $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant + mkdir NameService + mkdir GroupService 2) Start primary tao_ft_naming process - $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ - --primary \ - -ORBListenEndPoints iiop://<hostname>:<port1> \ - -o /tmp/ns_primary.ior \ - -h /tmp/nm_primary.ior \ - -r NameService \ - -v GroupService & + $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ + --primary \ + -ORBListenEndPoints iiop://<hostname>:<port1> \ + -o /tmp/ns_primary.ior \ + -h /tmp/nm_primary.ior \ + -r NameService \ + -v GroupService & 3) Start backup tao_ft_naming process - $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ - --backup \ - -ORBListenEndPoints iiop://<hostname>:<port2> \ - -o /tmp/ns_backup.ior \ - -h /tmp/nm_backup.ior \ - -c /tmp/ns_multi_profile.ior \ - -g /tmp/nm_multi_profile.ior \ - -r NameService \ - -v GroupService & + $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \ + --backup \ + -ORBListenEndPoints iiop://<hostname>:<port2> \ + -o /tmp/ns_backup.ior \ + -h /tmp/nm_backup.ior \ + -c /tmp/ns_multi_profile.ior \ + -g /tmp/nm_multi_profile.ior \ + -r NameService \ + -v GroupService & 4) Now run the test client with the equivalence argument - client --equivalence \ - -p file:///tmp/ns_primary.ior \ - -q file:///tmp/ns_backup.ior \ - -r file:///tmp/nm_primary.ior \ - -s file:///tmp/nm_backup.ior \ - -b 4 -d 4 - - ============================================================================== - Example Output: - ============================================================================== - INFO: ns1ref is not equivalent to ns2ref - INFO: ns1ref profile count: 1 - INFO: ns2ref profile count: 1 - INFO: Equivalence Name Test OK - INFO: nm1ref: file:///tmp/nm_primary.ior - INFO: nm2ref: file:///tmp/nm_backup.ior - INFO: nm1ref is not equivalent to nm2ref - INFO: nm1ref profile count: 1 - INFO: nm2ref profile count: 1 - INFO: Primary Found Object Group test_group_1 Created By Primary In Repository - INFO: Backup Found Object Group test_group_2 Created By Backup In Repository - INFO: Primary Found Object Group test_group_2 Created By Backup In Repository - INFO: Backup Found Object Group test_group_1 Created By Primary In Repository - INFO: Equivalence ObjectGroup Test OK + client --equivalence \ + -p file:///tmp/ns_primary.ior \ + -q file:///tmp/ns_backup.ior \ + -r file:///tmp/nm_primary.ior \ + -s file:///tmp/nm_backup.ior \ + -b 4 -d 4 + +============================================================================== +Example Output: +============================================================================== +INFO: ns1ref is not equivalent to ns2ref +INFO: ns1ref profile count: 1 +INFO: ns2ref profile count: 1 +INFO: Equivalence Name Test OK +INFO: nm1ref: file:///tmp/nm_primary.ior +INFO: nm2ref: file:///tmp/nm_backup.ior +INFO: nm1ref is not equivalent to nm2ref +INFO: nm1ref profile count: 1 +INFO: nm2ref profile count: 1 +INFO: Primary Found Object Group test_group_1 Created By Primary In Repository +INFO: Backup Found Object Group test_group_2 Created By Backup In Repository +INFO: Primary Found Object Group test_group_2 Created By Backup In Repository +INFO: Backup Found Object Group test_group_1 Created By Primary In Repository +INFO: Equivalence ObjectGroup Test OK 5) Cleanup - rm -rf NameService - rm -rf GroupService - + rm -rf NameService + rm -rf GroupService diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl index c650bee8b59..2fc343e1dd9 100755 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_backup_restart_test.pl @@ -10,7 +10,6 @@ use Cwd; #$ENV{ACE_TEST_VERBOSE} = "1"; -my $startdir = getcwd(); my $debug_level = '0'; my $redirection_enabled = 0; @@ -26,20 +25,16 @@ foreach $i (@ARGV) { my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; - # Variables for command-line arguments to client and server # executables. my $hostname = $server->HostName (); - my $ns_orb_port1 = 10001; my $ns_orb_port2 = 10002; my $ns_endpoint1 = "iiop://$hostname:$ns_orb_port1"; my $ns_endpoint2 = "iiop://$hostname:$ns_orb_port2"; - - # References to both naming services my $default_init_ref = "-ORBDefaultInitRef corbaloc:iiop:$hostname:$ns_orb_port1,iiop:$hostname:$ns_orb_port2"; @@ -315,7 +310,6 @@ sub backup_restart_test() "-v $group_dir"; my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; - my $client_args = "--failover " . "-ORBDebugLevel $debug_level " . "-p file://$server_ns_iorfile " . @@ -323,7 +317,7 @@ sub backup_restart_test() "-b 4 " . "-d 4 " ; - my $client_prog = "$startdir/client"; + my $client_prog = "client"; $NS1 = $server->CreateProcess ($tao_ft_naming, $ns1_args); $NS2 = $server->CreateProcess ($tao_ft_naming, $ns2_args); diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl index bb853f187bb..b0f95402aef 100755 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl @@ -10,7 +10,6 @@ use Cwd; #$ENV{ACE_TEST_VERBOSE} = "1"; -my $startdir = getcwd(); my $debug_level = '0'; my $redirection_enabled = 0; @@ -344,8 +343,7 @@ sub redundant_equivalency_test() "-b 4 " . "-d 4 "; - my $client_prog = "$startdir/client"; - + my $client_prog = "client"; $NS1 = $server->CreateProcess ($tao_ft_naming, $ns1_args); $NS2 = $server->CreateProcess ($tao_ft_naming, $ns2_args); diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl index 82ad0816ca5..8ae1cd596a1 100755 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl @@ -10,7 +10,6 @@ use Cwd; #$ENV{ACE_TEST_VERBOSE} = "1"; -my $startdir = getcwd(); my $debug_level = '0'; my $redirection_enabled = 0; @@ -322,7 +321,7 @@ sub failover_test() "-b 4 " . "-d 4 " ; - my $client_prog = "$startdir/client"; + my $client_prog = "client"; print STDERR "$tao_ft_naming $ns1_args\n"; print STDERR "$tao_ft_naming $ns2_args\n"; diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl index c8c4fe9dccf..134f9d7b8d9 100755 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl @@ -23,15 +23,12 @@ foreach $i (@ARGV) { if ($i eq '-verbose') { $redirection_enabled = 0; } - } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $server2 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; - - # Variables for command-line arguments to client and server # executables. @@ -95,12 +92,12 @@ sub compare_file_with_backup($) my $file = shift; my $backup = $file . ".bak"; unless (-e $backup) { - print STDERR "ERROR: Backup file $backup does not exist\n"; - return 1; + print STDERR "ERROR: Backup file $backup does not exist\n"; + return 1; } my $result = compare ($file, $backup); if ($result != 0) { - print STDERR "ERROR: Backup file $backup does not agree with $file\n"; + print STDERR "ERROR: Backup file $backup does not agree with $file\n"; } return $result; } @@ -537,25 +534,25 @@ sub backup_restore_test () print_msg("Verifying naming context backup files"); $file = $name_dir . "/NameService"; if (compare_file_with_backup ($file) != 0) { - $status = 1; + $status = 1; } for ($i = 0; $i < $num_child_contexts; $i++) { - $file = $name_dir . "/NameService_$i"; - if (compare_file_with_backup ($file) != 0) { - $status = 1; - } + $file = $name_dir . "/NameService_$i"; + if (compare_file_with_backup ($file) != 0) { + $status = 1; + } } print_msg("Verifying object group backup files"); $file = $group_dir . "/ObjectGroup_global"; if (compare_file_with_backup ($file) != 0) { - $status = 1; + $status = 1; } for ($i = 0; $i < $num_object_groups; $i++) { - $file = $group_dir . "/ObjectGroup_$i"; - if (compare_file_with_backup ($file) != 0) { - $status = 1; - } + $file = $group_dir . "/ObjectGroup_$i"; + if (compare_file_with_backup ($file) != 0) { + $status = 1; + } } ##6. Replace some of the data files with corrupt files @@ -567,7 +564,7 @@ sub backup_restore_test () @allfiles = grep(/^NameService/, readdir(NAMEDIR)); closedir(NAMEDIR); foreach $file (@allfiles) { - copy ($corrupt_name_dir . $file, $name_dir . "/" . $file) or die "Copy failed: $!\n"; + copy ($corrupt_name_dir . $file, $name_dir . "/" . $file) or die "Copy failed: $!\n"; } my $corrupt_group_dir = $corrupt_data_dir . $group_dir . "/"; @@ -575,7 +572,7 @@ sub backup_restore_test () @allfiles = grep(/^ObjectGroup/, readdir(GROUPDIR)); closedir(GROUPDIR); foreach $file (@allfiles) { - copy ($corrupt_group_dir . $file, $group_dir . "/" . $file) or die "Copy failed: $!\n"; + copy ($corrupt_group_dir . $file, $group_dir . "/" . $file) or die "Copy failed: $!\n"; } ##7. Start a new instance of the tao_ft_naming server @@ -606,8 +603,8 @@ sub backup_restore_test () } if ($restore_status == 1) { - cat_file($client_stderr_file); - cat_file($client_stdout_file); + cat_file($client_stderr_file); + cat_file($client_stdout_file); } print_msg("INFO: terminating test server"); diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl deleted file mode 100755 index 56dc7e1c51a..00000000000 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_test.pl +++ /dev/null @@ -1,44 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; -use Cwd; - - -my @list=("run_failover_test.pl", - "run_persistence_test.pl", - "run_equivalence_test.pl", - "run_backup_restart_test.pl"); - -my $status = 0; - -my $debug_option = ''; - -foreach $i (@ARGV) { - if ($i eq '-debug') { - $debug_option = '-debug'; - } -} - -for $cmd (@list) { - if (-f $cmd) { - if (system ("perl $cmd $debug_option") != 0) { - $status = 1; - } - } else { - print STDERR "ERROR: Can't find $cmd\n"; - } -} -my $test_label = "FT_Naming FaultTolerant"; - -if ($status != 0) { - print STDERR "ERROR: One or more $test_label tests Failed\n"; -} else { - print STDERR "INFO: All $test_label tests report OK\n"; -} - -exit $status; diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl index ad43caf54c3..622752897bd 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl @@ -55,7 +55,6 @@ sub init_naming_context_directory($$) } } - # Variables for command-line arguments to client and server # executables. my $ns_orb_primary_port1 = 9931; diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl index 8a0585241d9..412edf8d760 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl @@ -13,7 +13,6 @@ use Cwd; $status = 0; $debug_level = '0'; -$startdir = getcwd(); my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; @@ -92,7 +91,7 @@ my $args = "-ORBEndPoint $ns_endpoint1 " . "-r $naming_persistence_dir " . "-v $groups_persistence_dir " . "--primary"; -my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; +my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; print STDERR "Starting Primary: $prog $args\n"; @@ -121,7 +120,7 @@ $args = "-ORBEndPoint $ns_endpoint2 " . "-v $groups_persistence_dir " . "--backup"; -$prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; +$prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; print STDERR "Starting Backup: $prog $args\n"; diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl index d4ba7ec0499..f9cc8fd812f 100755 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl @@ -11,8 +11,6 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; use Cwd; -$startdir = getcwd(); - $quiet = 0; # check for -q flag @@ -106,7 +104,7 @@ my $args = "-orbdebuglevel 1 -orbverboselogging 1 -ORBLogFile primary.log -ORBEn "-v $groups_persistence_dir " . "-n 100 " . "--primary"; -my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; +my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; print STDERR "Starting Primary: $prog $args\n"; @@ -137,9 +135,9 @@ $args = "-ORBEndPoint $ns_endpoint2 " . "-orbdebuglevel 1 -orbverboselogging 1 -ORBLogFile backup.log " . "--backup"; -$prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; +$prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; -print STDERR "Starting Backup: $prog $args\n in $startdir\n"; +print STDERR "Starting Backup: $prog $args\n\n"; $NS2 = $test->CreateProcess ("$prog", "$args"); @@ -162,7 +160,7 @@ $args = "-p corbaloc:iiop:$hostname:$ns_orb_port1/NameService " . "-b 4 " . "-d 4 " . "-t 100"; -$prog = "$startdir/client"; +$prog = "client"; print STDERR "Starting Client: $prog $args\n"; @@ -186,7 +184,7 @@ $NS1->Kill (); print STDERR "Printing Naming Tree from combined Name Service pair.\n"; -$prog = "$startdir/../../../../utils/nslist/tao_nslist"; +$prog = "$ENV{TAO_ROOT}/utils/nslist/tao_nslist"; $args = "--ns file://$combined_ns_iorfile"; $NSL = $test->CreateProcess("$prog", "$args"); diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl index 72972f1f213..548d738be66 100755 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/run_test.pl @@ -125,7 +125,7 @@ my $args = "-ORBEndPoint $ns_endpoint1 " . "-o $ns_iorfile -h $nm_iorfile " . "-ORBDebuglevel $debug_level -ORBVerboseLogging 1 -ORBLogFile $primary_logfile "; -my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming"; +my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; print STDERR "Starting Primary: $prog $args\n"; diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/README b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/README index 28ac5a5d6c8..ec2741de70b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/README +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/README @@ -11,3 +11,6 @@ interrogates for judging success. Runtime options are -debug to turn on verbose debugging to separate log files and -no_dns, which forces the use of 127.0.0.1 in endpoints for running in environments in which DNS is not properly configured. + +This test has been extended with a test to make sure the ImR works when there is +a delay between the process startup and the creation of the POA diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl index 2a333b4a6e5..f439ca145be 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test.idl @@ -2,4 +2,5 @@ interface Test { short get_server_num (); oneway void terminate (); + oneway void shutdown (); }; diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp index 3091a829c2c..6ef8f1f9542 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp @@ -4,6 +4,10 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" +Test_i::Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate(orb)) +{ +} + CORBA::Short Test_i::get_server_num (void) { @@ -16,3 +20,10 @@ Test_i::terminate (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received terminate and going to exit\n")); exit (0); } + +void +Test_i::shutdown (void) +{ + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown and going to exit\n")); + orb_->shutdown (); +} diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h index 984bc38669f..65826facc02 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h @@ -12,9 +12,14 @@ class Test_i : public virtual POA_Test { public: + Test_i (CORBA::ORB_ptr orb); virtual CORBA::Short get_server_num (void); virtual void terminate (void); + + virtual void shutdown (void); +private: + CORBA::ORB_var orb_; }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp index e9f5e6c73f0..2eba63f0baf 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/client.cpp @@ -4,11 +4,12 @@ #include "ace/OS_NS_unistd.h" bool killit = false; +bool shutdown_server = false; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ks")); int c; while ((c = get_opts ()) != -1) @@ -17,6 +18,9 @@ parse_args (int argc, ACE_TCHAR *argv[]) case 'k': killit = true; break; + case 's': + shutdown_server = true; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, @@ -53,6 +57,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client send terminate request\n")); } + else if (shutdown_server) + { + test->shutdown (); + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Client send shutdown request\n")); + } else { CORBA::Short const n = test->get_server_num (); @@ -64,8 +74,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) catch (const CORBA::Exception &ex) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Client caught: %C on first attempt, retrying killit %d\n", - ex._name (), killit)); + "(%P|%t) Client caught: %C on first attempt, retrying killit <%d> shutdown <%d>\n", + ex._name (), killit, shutdown_server)); try { if (CORBA::is_nil (test.in())) @@ -78,6 +88,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client send terminate request on second attempt\n")); } + else if (shutdown_server) + { + test->shutdown (); + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Client send shutdown request on second attempt\n")); + } else { CORBA::Short const n = test->get_server_num (); diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl index 6216317b394..ec46d5d9079 100755 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl @@ -13,6 +13,7 @@ $debug_level = 0; $no_dns = 0; $imrhost = "127.0.0.1"; $poa_delay = 3; +$shutdown_delay = 0; if ($#ARGV >= 0) { for (my $i = 0; $i <= $#ARGV; $i++) { @@ -22,6 +23,14 @@ if ($#ARGV >= 0) { elsif ($ARGV[$i] eq '-no_dns') { $no_dns = 1; } + elsif ($ARGV[$i] eq "-s") { + $i++; + $shutdown_delay = $ARGV[$i]; + } + elsif ($ARGV[$i] eq "-c") { + $i++; + $shutdown_delay = $ARGV[$i]; + } else { usage(); exit 1; @@ -137,7 +146,7 @@ sub register_server $TI->Arguments ($ti_cmd_base. "add TestObject_a -c \"". $srv_server_cmd . - " -ORBUseIMR 1 -p $poa_delay -ORBLingerTimeout 0 " . + " -ORBUseIMR 1 -p $poa_delay -s $shutdown_delay -ORBLingerTimeout 0 " . "$debugarg $endpointarg " . "-ORBInitRef ImplRepoService=file://$imr_imriorfile\""); @@ -257,7 +266,7 @@ sub validate_servers sub double_server_test { print "Running slow servers errant duplicate test\n"; - my $debugarg = "-d 5 -ORBVerboseLogging 1 -ORBDebugLevel $debug_level -ORBLogfile $imrlogfile " if ($debug_level > 0); + my $debugarg = "-d 10 -ORBVerboseLogging 1 -ORBDebugLevel $debug_level -ORBLogfile $imrlogfile " if ($debug_level > 0); my $endpointarg = "-orbdotteddecimaladdresses 1" if ($no_dns == 1); my $result = 0; @@ -310,9 +319,13 @@ sub double_server_test manual_start_server(); if ($status == 0) { - - print "Initial client request to kill server\n"; - run_client ("-k"); + if ($shutdown_delay = 0) { + print "Initial client request to kill server\n"; + run_client ("-k"); + } else { + print "Initial client request to shutdown server\n"; + run_client ("-s"); + } sleep (1); print "Second client request to reactivate server \n"; diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp index dd010b3a7cd..45a56ca1902 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp @@ -15,7 +15,7 @@ class ORB_Runner : public ACE_Task_Base { public: - ORB_Runner (CORBA::ORB_var orb) : orb_(orb) {} + explicit ORB_Runner (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) {} int svc (void) { this->orb_->run (); @@ -26,7 +26,6 @@ private: CORBA::ORB_var orb_; }; - PortableServer::POA_var root_poa; PortableServer::POA_var poa_a; @@ -62,14 +61,15 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); - ORB_Runner *runner = new ORB_Runner (orb); + ORB_Runner *runner = new ORB_Runner (orb.in ()); int poa_delay = 10; + int shutdown_delay = 0; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start server main\n")); try { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("p:?")); + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("p:s:?")); int c; while ((c = get_opts ()) != -1) @@ -78,11 +78,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) case 'p': poa_delay = ACE_OS::atoi (get_opts.opt_arg ()); break; + case 's': + shutdown_delay = ACE_OS::atoi (get_opts.opt_arg ()); + break; case '?': ACE_DEBUG ((LM_DEBUG, "usage: %s " "-d <seconds to delay before initializing POA> " - "-n Number of the server\n", + "-s <seconds to delay before exiting main after the ORB destroy>\n", argv[0])); return 1; break; @@ -97,7 +100,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_CString base = ACE_CString ("TestObject"); createPOAs (base); - PortableServer::Servant_var<Test_i> test_servant = new Test_i; + PortableServer::Servant_var<Test_i> test_servant = new Test_i (orb.in ()); PortableServer::ObjectId_var object_id = PortableServer::string_to_ObjectId (base.c_str()); @@ -107,7 +110,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Test_var tva = Test::_narrow (obj.in()); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Started Server pid = %d poa delay %d\n", ACE_OS::getpid (), poa_delay)); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Started Server pid <%P> poa delay <%d> shutdown delay <%d>\n", poa_delay, shutdown_delay)); { ACE_CString status_file = base + ACE_CString(".status"); @@ -119,11 +122,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) out << ACE_OS::getpid () << endl; out.close (); } - ACE_Time_Value tv (poa_delay); - ACE_OS::sleep (tv); + ACE_OS::sleep (poa_delay); activatePOAs (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Activated POA pid = %d\n", ACE_OS::getpid ())); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Activated POA pid <%P>\n")); TAO_Root_POA* tpoa = dynamic_cast<TAO_Root_POA*> (poa_a.in ()); ACE_ASSERT (tpoa != 0); @@ -136,10 +138,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_ior = orb->object_to_string (tva.in()); base += "_a"; - ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:\n%s\n", base.c_str(), test_ior.in())); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) %C:\n%C\n", base.c_str(), test_ior.in())); table->bind (base.c_str (), test_ior.in ()); runner->wait (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Destroying POA pid <%P>\n")); + root_poa->destroy(1,1); orb->destroy(); } @@ -152,8 +157,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) delete runner; orb = CORBA::ORB::_nil (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Exiting Server pid = %d \n", - ACE_OS::getpid ())); + ACE_OS::sleep (shutdown_delay); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Exiting Server pid <%P>\n")); return 0; } diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl index e77707d49a2..afa6ba895d5 100755 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl @@ -41,9 +41,9 @@ $act->DeleteFile ($actiorfile); $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator", +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator", "-o $imr_imriorfile"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator", +$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator", "-o $act_actiorfile ". "-ORBInitRef ImplRepoService=file://$act_imriorfile"); $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl index 4c558928466..afeff4a3969 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl @@ -37,11 +37,11 @@ my $act_actiorfile = $act->LocalFile ($actiorfile); my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); my $test_nsiorfile = $test->LocalFile ($nsiorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator"); +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator"); +$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming"); +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"); my $ns_cmd = $NS->Executable(); my $ns_ns_cmd = $imr->LocalFile ($ns_cmd); diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl index 3d59f6fee81..6305ac82cdb 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl @@ -37,11 +37,11 @@ my $act_actiorfile = $act->LocalFile ($actiorfile); my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); my $test_nsiorfile = $test->LocalFile ($nsiorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator"); +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/tao_imr_activator"); +$ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); -$NS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); my $ns_cmd = $NS->Executable(); my $ns_ns_cmd = $imr->LocalFile ($ns_cmd); diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl index fb17409ea59..55ac3efa24c 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/run_test.pl @@ -99,7 +99,7 @@ $srvb->DeleteFile ($srvbiorfile); $cli->DeleteFile ($srvaiorfile); $ti->DeleteFile ($imriorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator", +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator", "-ORBEndpoint "."$protocol"."://:".$port." ". "-UnregisterIfAddressReused $imr_debug". $ping_ext . @@ -149,7 +149,7 @@ if ($do_link == 1) { my $poaC = "AAA:" if ($srv_a_id =~ /AAA/); $poaC .= "poaC"; - $TI = $ti->CreateProcess ("../../../ImplRepo_Service/tao_imr", + $TI = $ti->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr", "-ORBInitRef ImplRepoService=file://$srva_imriorfile ". "add $poaA -c serverA"); if ($ti->PutFile ($imriorfile) == -1) { diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp index df6ec85f5a2..14661239937 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp @@ -123,5 +123,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; } - - diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp index d5776eec110..9f338efb08c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp @@ -93,8 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableServer::POA_var poa_a = rootPOA->create_POA ("poaB", poa_manager.in (), - policies - ); + policies); for (CORBA::ULong i = 0; i < policies.length (); diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp index 8d781e5a64d..6a76a9bc053 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp @@ -1,7 +1,6 @@ #include "test_i.h" #include "ace/OS_NS_time.h" - // Implementation skeleton constructor Test_Dummy_i::Test_Dummy_i (void) { @@ -12,9 +11,7 @@ Test_Dummy_i::~Test_Dummy_i (void) { } -char * Test_Dummy_i::getMessage ( - void - ) +char * Test_Dummy_i::getMessage (void) { // Add your implementation here return CORBA::string_dup("Test::Dummy---->Hello World"); @@ -29,22 +26,17 @@ Test_Time_i::~Test_Time_i (void) { } -::CORBA::Long Test_Time_i::current_time ( - void - ) +::CORBA::Long Test_Time_i::current_time (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n")); return CORBA::Long (ACE_OS::time (0)); } -void Test_Time_i::shutdown ( - void - ) +void Test_Time_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, - "%s\n", + "%C\n", "Time_i is shutting down")); - } diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h index ff679e82b06..536c7fe81a8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h @@ -7,7 +7,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - class Test_Dummy_i : public virtual POA_taoimrtest::reconnectserver::Dummy { @@ -31,17 +30,10 @@ public: // Destructor virtual ~Test_Time_i (void); - virtual - ::CORBA::Long current_time ( - void - ); + virtual ::CORBA::Long current_time (void); - virtual - void shutdown ( - void - ); + virtual void shutdown (void); }; - #endif /* IMR_RECONNECTSERVER_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp index 8d781e5a64d..adc92c4336a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp @@ -1,7 +1,6 @@ #include "test_i.h" #include "ace/OS_NS_time.h" - // Implementation skeleton constructor Test_Dummy_i::Test_Dummy_i (void) { @@ -12,9 +11,7 @@ Test_Dummy_i::~Test_Dummy_i (void) { } -char * Test_Dummy_i::getMessage ( - void - ) +char * Test_Dummy_i::getMessage (void) { // Add your implementation here return CORBA::string_dup("Test::Dummy---->Hello World"); @@ -29,22 +26,17 @@ Test_Time_i::~Test_Time_i (void) { } -::CORBA::Long Test_Time_i::current_time ( - void - ) +::CORBA::Long Test_Time_i::current_time (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n")); return CORBA::Long (ACE_OS::time (0)); } -void Test_Time_i::shutdown ( - void - ) +void Test_Time_i::shutdown (void) { ACE_DEBUG ((LM_DEBUG, "%s\n", "Time_i is shutting down")); - } diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h index 3b77ade88cc..53cef409396 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h @@ -31,15 +31,9 @@ public: // Destructor virtual ~Test_Time_i (void); - virtual - ::CORBA::Long current_time ( - void - ); - - virtual - void shutdown ( - void - ); + virtual ::CORBA::Long current_time (void); + + virtual void shutdown (void); }; diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/README b/TAO/orbsvcs/tests/ImplRepo/RestartServer/README index e324f8ef8a7..999b2bb56df 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/README +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/README @@ -1,5 +1,3 @@ - - This test verifies that if a server launched by the ImR activator is terminated, then it will be relaunched transparently by the ORB if the client makes another request if -ORBForwardOnTransientLimit and -ORBForwardOnReplyClosedLimit options diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/README b/TAO/orbsvcs/tests/ImplRepo/kill_server/README index 0390eb5cd8a..834c10e14c2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/README +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/README @@ -1,5 +1,3 @@ - - This test starts up servers then uses the tao_imr kill command to force server termination via signal. diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/README b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/README index 0bcf58a4ba8..996416bec09 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/README +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/README @@ -1,5 +1,3 @@ - - This test verifies the ImplRepo service can tolerate servers that are slow to start. In some cases a server may have dependencies to resolve after creating its POAs but before activating them. During this time the server is unable to @@ -7,7 +5,7 @@ respond to shutdown requests, and a kill is required. This test ensures that following the failed shutdown and subsequent kill, the server can be restarted. The server instances append their pid to a status file, which the run script -interogates for judging success. +interrogates for judging success. Runtime options are -debug to turn on verbose debugging to separate log files and -no_dns, which forces the use of 127.0.0.1 in endpoints for running in diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl index 8a71f966081..2a333b4a6e5 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test.idl @@ -1,7 +1,5 @@ interface Test { - short get_server_num (); oneway void terminate (); - }; diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h index 4fe622f87c7..984bc38669f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h @@ -12,12 +12,9 @@ class Test_i : public virtual POA_Test { public: - virtual CORBA::Short get_server_num (void); virtual void terminate (void); - -private: }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp index 34668b48a26..7feb962aa13 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/client.cpp @@ -3,7 +3,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" - bool killit = false; int diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp index 8c43ec1ef9d..293ae2579d8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp @@ -46,7 +46,7 @@ createPOAs(ACE_CString &base) PortableServer::POAManager_var mgr = PortableServer::POAManager::_nil(); ACE_CString poa_name = base + ACE_CString ("_a"); - ACE_DEBUG ((LM_DEBUG, "%P server creating POA %s\n", poa_name.c_str())); + ACE_DEBUG ((LM_DEBUG, "%P server creating POA %C\n", poa_name.c_str())); poa_a = root_poa->create_POA(poa_name.c_str(), mgr.in(), pols); } @@ -114,7 +114,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ofstream out(status_file.c_str (), ios_base::app); if (!out.good()) { - ACE_DEBUG ((LM_DEBUG, "server did not get good bit from %s\n", status_file.c_str())); + ACE_DEBUG ((LM_DEBUG, "server did not get good bit from %C\n", status_file.c_str())); } out << ACE_OS::getpid () << endl; out.close (); @@ -136,7 +136,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) test_ior = orb->object_to_string (tva.in()); base += "_a"; - ACE_DEBUG ((LM_DEBUG, "%s:\n%s\n", base.c_str(), test_ior.in())); + ACE_DEBUG ((LM_DEBUG, "%C:\n%C\n", base.c_str(), test_ior.in())); table->bind (base.c_str (), test_ior.in ()); runner->wait (); diff --git a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl index e630b7409b6..8b49865299c 100755 --- a/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/locked/run_test.pl @@ -34,7 +34,7 @@ $ti->DeleteFile ($imriorfile); $imr->DeleteFile ($imrpfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/tao_imr_locator"); +$IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README index 764020f184b..5db1a2a08b1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/README @@ -1,5 +1,3 @@ - - This test runs checks the behavior of the IMR when a server shuts down while it is in the middle of handling a ping request from the ImR Locator. This scenario could happen in an MT server, although to avoid diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp index b1693cd7f78..337c130d38f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/Server_ORBInitializer.cpp @@ -10,14 +10,12 @@ Server_ORBInitializer::Server_ORBInitializer (int *counter) } void -Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr) +Server_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } void -Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info) +Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { if (this->intr_ != 0) { diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl index efa412deabc..f22cfa7510d 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/run_test.pl @@ -10,17 +10,19 @@ use PerlACE::TestTarget; $status = 0; $imr_debug = ""; +$act_debug = ""; if ($#ARGV >= 0) { for (my $i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-debug') { - $imr_debug = "-d 5 -ORBDebugLevel 10 -ORBVerboseLogging 1 -ORBLogFile imr_loc.log"; - $i++; - } - else { - usage(); - exit 1; - } + if ($ARGV[$i] eq '-debug') { + $imr_debug = "-d 10 -ORBDebugLevel 10 -ORBVerboseLogging 1 -ORBLogFile imr_loc.log"; + $act_debug = "-d 10 -ORBDebugLevel 10 -ORBVerboseLogging 1 -ORBLogFile imr_act.log"; + $i++; + } + else { + usage(); + exit 1; + } } } @@ -103,7 +105,7 @@ sub server_setup () { print "initializing activator\n"; - $ACT->Arguments ("-d 0 -l -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); + $ACT->Arguments ("-l -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile $act_debug"); $ACT_status = $ACT->Spawn (); if ($ACT_status != 0) { @@ -138,7 +140,6 @@ sub server_setup () return 1; } - $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". "start $objprefix"); @@ -152,7 +153,6 @@ sub server_setup () $TI_status = 0; } - sub interrupt_ping_test { print "Running interrupt ping test.\n"; @@ -206,8 +206,8 @@ sub interrupt_ping_test my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval()); if ($IMR_status != 0) { - print STDERR "ERROR: IMR returned $IMR_status\n"; - $status = 1; + print STDERR "ERROR: IMR returned $IMR_status\n"; + $status = 1; } my $test_time = time() - $start_time; @@ -218,8 +218,7 @@ sub interrupt_ping_test } sub usage() { - print "Usage: run_test.pl ". - "[-debug]\n"; + print "Usage: run_test.pl [-debug]\n"; } ############################################################################### diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp index d884c5953d2..8c8247294ea 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp @@ -57,7 +57,7 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( } catch (const CORBA::Exception &ex) { - ACE_DEBUG ((LM_DEBUG, "(%P) deactivate raised %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P) deactivate raised %C\n", ex._name())); } throw ::CORBA::TRANSIENT @@ -66,7 +66,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( } - void Ping_Death_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h index 8c2a9bdc62a..913e58f89c1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h @@ -17,28 +17,27 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Server-side echo interceptor. For checking interceptor visually only. class Ping_Death_Request_Interceptor : public virtual PortableInterceptor::ServerRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Server-side echo interceptor. For checking interceptor visually only. public: - Ping_Death_Request_Interceptor (int *counter); // cotr. + Ping_Death_Request_Interceptor (int *counter); - ~Ping_Death_Request_Interceptor (); // dotr. + ~Ping_Death_Request_Interceptor (); void set_poa (PortableServer::POA_ptr poa); - virtual char * name (void); // Canonical name of the interceptor. + virtual char * name (void); virtual void destroy (void); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr); + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl index e2b374091aa..4d8262a770b 100755 --- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl @@ -88,8 +88,8 @@ my $imr_host = $imr->HostName (); my $port = 12345; my $endpoint = "-ORBEndpoint " . "$protocol" . "://:" . $port; -my $IMR = $imr->CreateProcess ("../../ImplRepo_Service/tao_imr_locator"); -my $ACT = $act->CreateProcess ("../../ImplRepo_Service/tao_imr_activator"); +my $IMR = $imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); +my $ACT = $act->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_activator"); my $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); # We want the tao_imr executable to be found exactly in the path @@ -100,7 +100,7 @@ $TI->IgnoreExeSubDir (1); my $replica_IMR; if ($replica) { - $replica_IMR = $replica_imr->CreateProcess ("../../ImplRepo_Service/tao_imr_locator"); + $replica_IMR = $replica_imr->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/ImplRepo_Service/tao_imr_locator"); } my @airplaneiorfile; diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README index 881b67175d9..20b750148b9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/README @@ -1,5 +1,3 @@ - - Servers Interacting on Startup Test =================================== @@ -87,4 +85,4 @@ the locator. -restart_loc Use to bounce the locator process by itself mid test. Only used by the list -test for now.
\ No newline at end of file +test for now. diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h index e936e9edc6f..3f91e3f4430 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/Test_i.h @@ -9,7 +9,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - class Test_i : public virtual POA_Test { public: @@ -24,7 +23,6 @@ public: private: CORBA::Short server_num_; CORBA::Short reply_delay_secs_; - }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl index c2ee0a24296..e39fa13f470 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl @@ -56,7 +56,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl index 159b8472317..042757d4401 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl @@ -35,7 +35,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl index bf273a45e39..b72b60c60ae 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl @@ -35,7 +35,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl index d81cf930f94..44f21ca7a45 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl @@ -35,7 +35,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl index 3af997650de..ad82c01980f 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl @@ -37,7 +37,7 @@ $client1->DeleteFile($ior1file); my $client2_ior1file = $client2->LocalFile ($ior1file); $client2->DeleteFile($ior1file); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "$nice " . "-o $server_ior1file " . diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl index 4da354dd963..46f36675db1 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl @@ -47,7 +47,7 @@ $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl index 586b371c569..cd0c51ffaab 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl @@ -32,7 +32,7 @@ $server->DeleteFile($iorfile); my $client_iorfile = $client->LocalFile ($iorfile); $client->DeleteFile($iorfile); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "$nice " . "-o $server_iorfile " . diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl index f6cc28cd300..802c492131b 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl @@ -22,7 +22,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); @@ -111,7 +111,7 @@ $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl index 0a7f917cbed..f1cc0540573 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl @@ -41,7 +41,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl index dac5d245efa..af717586ae6 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl @@ -33,7 +33,7 @@ sub idl_filenames { # Input: array of idl file names # Output: array of idl file names that had a failure sub phase1 { - my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/tao_ifr_service", + my $SVC = $ifr_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $ifr_service_iorfile"); my $CMP = $tao_ifr->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_ifr", diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl index 6c7548886aa..7682f579fef 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl @@ -15,7 +15,7 @@ if ($^O eq "MSWin32"){ $tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr"; } else{ - $tao_ifr = "../../../IFR_Service/tao_ifr"; + $tao_ifr = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr"; } my %isa = (); @@ -70,7 +70,7 @@ $test->DeleteFile ($log3); my $test_iorfile = $test->LocalFile ($iorbase); $test->DeleteFile($iorbase); -$SV1 = $test->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $test->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " -o $test_iorfile " . "-ORBLogFile $log1_test"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl index 8c541730246..b84f06d5826 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl @@ -48,7 +48,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl index d2fb1c0d254..43b31fc973e 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl @@ -42,7 +42,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl index 1e803108ed4..43e052a6cf2 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl @@ -41,7 +41,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl index f37a7c4382a..8b3b7c79dd4 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl @@ -37,7 +37,7 @@ $server->DeleteFile($iorbase); $server->DeleteFile($backing_file); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " -o $server_iorfile " . " $persistent"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl index 8bb7ccda4d7..a15fba38587 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl @@ -38,7 +38,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/IFR_Service/tao_ifr_service", " $nice " . "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl index c012275fcf0..bd149ca55ea 100755 --- a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl @@ -25,7 +25,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", "-s -ORBInitRef NameService=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl index 1ef3e736f16..d284573bd71 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl @@ -43,7 +43,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . ($^O eq 'MSWin32' ? diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl index d3f640869e4..97413de3cd5 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl @@ -75,7 +75,7 @@ for $test (@tests) { $status = 0; #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log - $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", + $LM = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" . " -ORBSvcConf $lm_conf"); $SV1 = $server2->CreateProcess ("server", $test->{svr1_args}); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl index 97effd66342..e5538d843ed 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl @@ -88,7 +88,7 @@ for $test (@tests) { $status = 0; #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log - $LM = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", + $LM = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" . " -ORBSvcConf $lm_conf"); $SV = $server2->CreateProcess ("server", $test->{svr_args}); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl index 9e6613ce73b..b4d079b788a 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/run_test.pl @@ -43,7 +43,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . ($^O eq 'MSWin32' ? diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl index 243e54741ab..d460b160627 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/run_test.pl @@ -24,7 +24,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-o $server_iorfile " . ($^O eq 'MSWin32' ? " -ORBSvcConf $lm_conf" : '')); diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl index 82fa6ab7197..a763424a80f 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/run_test.pl @@ -37,11 +37,11 @@ my $client_iorfile = $client->LocalFile ($iorfile); $client->DeleteFile($iorfile); -$SV1 = $server1->CreateProcess ("../../../../LoadBalancer/tao_loadmanager", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmanager", "-ORBdebuglevel $debug_level " . "-o $server1_iorfile"); -$SV2 = $server2->CreateProcess ("../../../../LoadBalancer/tao_loadmonitor", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/tao_loadmonitor", "-ORBdebuglevel $debug_level " . "-l $location " . "-t CPU -s PULL " . diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl index b1b44318d6b..07d6a0fcd9f 100755 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl @@ -28,9 +28,9 @@ $ns_service->DeleteFile ($iorbase); $lg_service->DeleteFile ($iorbase); $client->DeleteFile ($iorbase); -$NS = $ns_service->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_iorfile"); -$LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/tao_tls_basic", +$LS = $lg_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/tao_tls_basic", "-ORBInitRef NameService=file://$lg_iorfile"); $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index ff8a6305f95..fb38960eccc 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -90,7 +90,7 @@ else { @test_configs = @ARGV; } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); @@ -132,7 +132,7 @@ for $config (@test_configs) { my $nfs_config = $nfs->LocalFile ($config); - $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", + $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", ' '.$dispatch_opt.' '. "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 261502d1c9a..1f699934ef0 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -87,7 +87,7 @@ else { @test_configs = @ARGV; } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); @@ -129,7 +129,7 @@ for $config (@test_configs) { my $nfs_config = $nfs->LocalFile ($config); - $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", + $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", ' '.$dispatch_opt.' '. "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index 9e0eb883efb..1e3905e547c 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index 87a1b5bfe70..78f6114cfeb 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl index 9d9bf4b1c71..d24e9a843cf 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl @@ -44,7 +44,7 @@ if ($#ARGV >= 0 && $ARGV[0] eq '-p') { $consumer_runtime = 20; } -my $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". "-NoNameSvc -IORoutput $nfs_nfsiorfile $svcconf " . "-ORBEndpoint iiop://$host:$port"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl index d36c3bf08cf..91ae2a85513 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -47,10 +47,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://$ns_host:$ns_port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=corbaloc::" . "$ns_host:$ns_port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . @@ -204,7 +204,7 @@ $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); $nfs->DeleteFile ($nfsiorfile); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=corbaloc::" . "$ns_host:$ns_port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 27d3d6b9aad..46929f02acf 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -48,10 +48,10 @@ $sup->DeleteFile ($supiorfile); $con1->DeleteFile ($supiorfile); $con2->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl index 1e9e37a3217..e82f16e67a6 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl @@ -36,12 +36,12 @@ $server2->DeleteFile($ior2file); $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); -$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-ORBInitRef NameService=iioploc://$hostname:$port/NameService " . "-IORoutput $server2_ior2file " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl index c7abe1cb159..1ea1eacab1b 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl @@ -40,7 +40,7 @@ $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl index ca7373336bf..f67607d2a25 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl @@ -33,7 +33,7 @@ $server1->DeleteFile($ior1file); $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-NoNameSvc -IORoutput $server1_ior1file $svcconf " . "-ORBEndpoint iiop://$hostname:$port"); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index c0e239cc85a..72ee2ef01ec 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -64,10 +64,10 @@ foreach my $arg (@ARGV) { } } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index c7e14a522e1..08fb3d48377 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -62,10 +62,10 @@ my $client2_client_ior = $client2->LocalFile ($client_ior); $client2->DeleteFile($ior1file); $client2->DeleteFile($client_ior); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$SV1 = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $server1_ior1file"); -$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$server2_ior1file " . "-IORoutput $server2_ior2file " . "-ORBSvcConf $server2_conf"); diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 59156e275f6..2c39fbdd1d8 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -85,9 +85,9 @@ if ($nfs->PutFile ($notify_conf) == -1) { exit 1; } -my $NS = $ns->CreateProcess("../../../Naming_Service/tao_cosnaming", +my $NS = $ns->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $nsiorfile"); -my $NFS = $nfs->CreateProcess("../../../Notify_Service/tao_cosnotification", +my $NFS = $nfs->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". "$nscorbaloc " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index d5cdcf52f29..c5bbbcf2552 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -67,10 +67,10 @@ $con->DeleteFile ($coniorfile); }, ); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". " -IORoutput $nfs_nfsiorfile"; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index b523c3fb0f9..b26025b89d4 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -64,10 +64,10 @@ foreach my $arg (@ARGV) { } } -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h index d683c74edce..da0f8ad67b3 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h @@ -201,13 +201,11 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); virtual void disconnect_structured_push_consumer (); }; diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl index ff53a833e79..bf443147f60 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl @@ -46,10 +46,10 @@ $nfs->DeleteFile ($nfsiorfile); $nfs->DeleteFile ($persistent_xml); $nfs->DeleteFile ($persistent_000); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBSvcConf $nfs_svc_conf -ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; $SUP = $sup->CreateProcess ("supplier"); diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl index d5e9d41db6b..4ea87556e05 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl @@ -49,10 +49,10 @@ $sup->DeleteFile ($nfs2iorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBEndpoint iiop://$nfs_host:$nfs_port " . "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 7bc87083d6d..4b43325d224 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -1138,9 +1138,7 @@ Consumer_Main::find_notify_factory (void) this->naming_context_->resolve (name); this->ecf_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow ( - obj.in () - ); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); } return ! CORBA::is_nil (this->ecf_.in ()); } @@ -1399,9 +1397,7 @@ Consumer_Main::init_structured_proxy_supplier (void) { try { - proxy = this->sa_->get_proxy_supplier ( - this->structured_proxy_id_ - ); + proxy = this->sa_->get_proxy_supplier (this->structured_proxy_id_); ok = ! CORBA::is_nil (proxy.in ()); if (this->verbose_) { diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index f1980469a0b..26f4b891391 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -101,15 +101,11 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); - virtual void push ( - const CORBA::Any & data - ); + virtual void push (const CORBA::Any & data); - virtual void disconnect_push_consumer ( - ); + virtual void disconnect_push_consumer (); size_t received () const; void set_expectations (size_t expecte, size_t fail, size_t serial_number, bool verbose); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 7af8337bd6c..c550f4178fe 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -534,9 +534,7 @@ Supplier_Main::find_notify_factory (void) this->naming_context_->resolve (name); this->ecf_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow ( - obj.in () - ); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); } return ! CORBA::is_nil (this->ecf_.in ()); } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index 4ad2cb183b0..8c557aa1972 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -41,9 +41,9 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index e1a678e3550..d9b2fbadf98 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -41,9 +41,9 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index f954fae6858..3b6d2c1b6c7 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index efab347a441..7002b6aaf44 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -44,10 +44,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index 4b0d2475da6..c6282c68e8b 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -50,10 +50,10 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index ef933ed7431..0795c8cce42 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -48,9 +48,9 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -my $NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", +my $NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -my $NFS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification", +my $NFS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile -Timeout 750"); my $SUP = $ns->CreateProcess("Structured_Supplier", diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl index e4f0e68e05e..cfe55680976 100755 --- a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl @@ -38,7 +38,7 @@ $server->DeleteFile($iorbase); $client->DeleteFile ($persistent_file_xml); $client->DeleteFile ($persistent_file_000); -$SV = $server->CreateProcess ("../../../Notify_Service/tao_cosnotification", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-NoNameSvc " . "-IORoutput $server_iorfile " . diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index a7bdfe5d17f..615acf230fe 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -28,8 +28,7 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::obtain_proxy (typename TAO_Notify_ CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier = admin_ptr->obtain_notification_push_supplier (traits.type_ - , this->proxy_id_ - ); + , this->proxy_id_); ACE_ASSERT (!CORBA::is_nil (proxy_supplier.in ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index 695d29076db..76a8e27df7f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -71,8 +71,7 @@ protected: // = NotifyPublish method virtual void offer_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index dadd213d8c1..3ffc40f87d4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -18,7 +18,6 @@ #include "ace/SString.h" #include "orbsvcs/CosNotifyChannelAdminC.h" #include "Command.h" -//#include "../../../orbsvcs/Notify/CosNotify_Initializer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Service; diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index e9e3406e68e..27f11806aa7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -77,10 +77,8 @@ protected: // = PushConsumer methods virtual void disconnect_push_consumer (void); - /// Default does nothing. - void push ( - const CORBA::Any & data - ); + /// Default does nothing. + void push (const CORBA::Any & data); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index 05dec1bb49d..6bb54ea72d0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -79,8 +79,7 @@ protected: /// Default does nothing. virtual void push_structured_events ( - const CosNotification::EventBatch & notifications - ); + const CosNotification::EventBatch & notifications); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index 6c6e71a1749..3701c977647 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -79,8 +79,7 @@ protected: /// Default does nothing. virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 6620ef54e39..33fb119d383 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -28,8 +28,7 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::obtain_proxy (typename TAO_Notify_ CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = admin_ptr->obtain_notification_push_consumer (traits.type_ - , this->proxy_id_ - ); + , this->proxy_id_); ACE_ASSERT (!CORBA::is_nil (proxy_consumer.in ())); diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index ce16c5c31a4..8b9e22292c8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -69,11 +69,10 @@ protected: virtual Proxy_Traits_PTR obtain_proxy (Admin_Ext_Traits_PTR admin_ptr , CosNotification::QoSProperties& qos); - // = NotifySubscribe - virtual void subscription_change ( - const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + // = NotifySubscribe + virtual void subscription_change ( + const CosNotification::EventTypeSeq & added, + const CosNotification::EventTypeSeq & removed); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index c122595de2c..3c4198790f7 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -38,9 +38,9 @@ my $host = $nm_service->HostName(); my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService "; -$NS = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", +$NS = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior"); -$TS = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", $initref. +$TS = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", $initref. "-IORoutput $ts_notify_ior -ORBSvcConf $ts_notify_conf"); $STS = $supplier->CreateProcess ("Structured_Supplier", $initref. "-o $supplier_supplier_ior"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 2f0cea4b3d9..107472cd390 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -31,9 +31,9 @@ $nt_service->DeleteFile ($notify_ior); $nt_service->DeleteFile ($naming_ior); $test->DeleteFile ($naming_ior); -$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile"); +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile"); $T = $test->CreateProcess ("RedGreen_Test", "-ORBInitRef NameService=file://$test_nmiorfile"); -$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", ""); +$NT_SV = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", ""); $nm_service_status = $NM_SV->Spawn (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl index 263d9cb476e..a20b3706fb3 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); # DeleteFile($file) or die "Could not delete $file"; #} -$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl index 9bf5f9060f8..0a4f35bb22c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); # DeleteFile($file) or die "Could not delete $file"; #} -$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl index 82bfb7dabf3..8f8b20e06d7 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl @@ -43,7 +43,7 @@ $supplier->DeleteFile ($consumer_ior); $consumer->DeleteFile ($naming_ior); $consumer->DeleteFile ($consumer_ior); -$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile"); $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl index 10189c75ef2..8fdad5e9d79 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl @@ -43,7 +43,7 @@ $supplier->DeleteFile ($consumer_ior); $consumer->DeleteFile ($naming_ior); $consumer->DeleteFile ($consumer_ior); -$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile"); $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl index 4467d13e858..a84c904a804 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl @@ -59,7 +59,7 @@ $sup->DeleteFile ($reliorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl index f3a665dcdd6..ab4dbab467a 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl @@ -59,7 +59,7 @@ $sup->DeleteFile ($reliorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl index a156aeec81f..1c84583868b 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl @@ -29,7 +29,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase); $nm_service->DeleteFile($iorbase); $collocated->DeleteFile($iorbase); -$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_iorfile"); $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl index ef99e205c60..ee6a71ee02c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl @@ -31,7 +31,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase); $nm_service->DeleteFile($iorbase); $collocated->DeleteFile($iorbase); -$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_iorfile"); $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl index b539a56f25d..f58e0e09cc9 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $nfs_nfsconffile"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl index 3746f296364..93777990d13 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl @@ -84,9 +84,9 @@ $con->DeleteFile ($supiorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $nfs_nfsconffile"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index d5a41164e4e..f9b2b14509b 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -65,10 +65,10 @@ $nm_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nt_ior); -$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBDebugLevel $debug_level -o $nm_service_nm_ior"); -$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", +$NT_SV = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nm_ior ". "-IORoutput $nt_service_nt_ior ". "-ORBSvcConf $nt_service_nt_conf ". diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl index b45faeff8bf..889e1dfba12 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl @@ -80,9 +80,9 @@ $nt_service_ntconffile = $nt_service->LocalFile($notify_conf); $high_path_hpconffile = $high_path->LocalFile($high_path_conf); $other_path_opconffile = $other_path->LocalFile($other_paths_conf); -$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", +$NM_SV = $nm_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile $debug"); -$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", +$NT_SV = $nt_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nmiorfile ". "-IORoutput $nt_service_ntiorfile ". "-ORBSvcConf $nt_service_ntconffile $debug"); diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index 33607e6c8a6..196bdb80bd7 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -32,7 +32,7 @@ $n_service->DeleteFile($iorbase); $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ". "-ORBInitRef NameService=file://$server_iorfile"); $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile"); -$NS = $n_service->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $n_service_iorfile"); +$NS = $n_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-o $n_service_iorfile"); print STDERR "Starting tao_cosnaming\n"; diff --git a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl index fb4e72fbf63..0dd7bbd4cb9 100755 --- a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl @@ -11,8 +11,6 @@ use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; use Cwd; -$startdir = getcwd(); - $quiet = 0; # check for -q flag @@ -77,7 +75,7 @@ else { # in files to find the individual copies of the Naming Servers. my $args = "-ORBEndPoint $ns_endpoint1 -o $iorfile1 -m 0 -r NameService"; -my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; +my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS1 = $test->CreateProcess ("$prog", "$args"); @@ -93,7 +91,7 @@ if ($test->WaitForFileTimed ($iorfile1, } $args = "-ORBEndPoint $ns_endpoint2 -o $test_iorfile2 -m 0 -r NameService"; -$prog = "$startdir/../../Naming_Service/tao_cosnaming"; +$prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS2 = $test->CreateProcess ("$prog", "$args"); @@ -114,7 +112,7 @@ if ($test->WaitForFileTimed ($iorfile2, sleep(1); $args = "-p file://$test_iorfile1 -q file://$test_iorfile2"; -$prog = "$startdir/client"; +$prog = "client"; $CL = $test->CreateProcess ("$prog", "$args"); diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl index a2b3352b09b..dd74dc9300d 100755 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl @@ -65,7 +65,7 @@ $cli->DeleteFile ($nsiorfile); sub name_server { my $args = "-ORBNameServicePort $ns_multicast_port -o $ns_nsiorfile -m 1 @_"; - my $prog = "../../../Naming_Service/tao_cosnaming"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($prog, $args); $ns->DeleteFile ($nsiorfile); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index f446b8ad818..3b2bc6044b6 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -75,7 +75,7 @@ $test->DeleteFile($persistent_log_file); sub name_server { my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_"; - my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $SV = $test->CreateProcess ("$prog", "$args"); @@ -96,7 +96,7 @@ sub name_server sub client { my $args = "@_"." "; - my $prog = "$startdir/client"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/tests/Simple_Naming/client"; $CL = $test->CreateProcess ("$prog", "$args"); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl index 3e27dd7b652..49299e5a180 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl @@ -37,7 +37,7 @@ $persistent_ior_file = "pns.ior"; my $test_iorfile = $test->LocalFile ($iorfile); my $test_persistent_ior_file = $test->LocalFile ($persistent_ior_file); -my $prog = "../../Naming_Service/tao_cosnaming"; +my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $test->DeleteFile($iorfile); $test->DeleteFile($persistent_ior_file); @@ -153,8 +153,8 @@ sub run_test $test->DeleteFile($iorfile); } -@server_exes = ("../../Naming_Service/tao_cosnaming", - "../../FT_Naming_Service/tao_ft_naming"); +@server_exes = ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", + "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"); foreach $e (@server_exes) { print STDERR "Testing Naming Service Executable: $e\n"; diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl index 9e62c2e1141..3b4ce6bede2 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl @@ -66,7 +66,7 @@ $test->DeleteFile($persistent_log_file); sub name_server { my $args = "-u NameService -ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_"; - my $prog = "$startdir/../../FT_Naming_Service/tao_ft_naming"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming"; $SV = $test->CreateProcess ("$prog", "$args"); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl index 6d197fcb7ac..9dfb7c9f25d 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl @@ -66,7 +66,7 @@ $test->DeleteFile($persistent_ior_file); sub name_server { my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_"; - my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; + my $prog = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $SV = $test->CreateProcess ("$prog", "$args"); @@ -95,7 +95,6 @@ sub client print STDERR "ERROR: client returned $client_status\n"; $status = 1; } - } ## The options below have been reordered due to a diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl index a04a4175f85..338a36acaaf 100755 --- a/TAO/orbsvcs/tests/Time/run_test.pl +++ b/TAO/orbsvcs/tests/Time/run_test.pl @@ -33,8 +33,8 @@ $clerk->DeleteFile($srv_ior); $clerk->DeleteFile($clk_ior); $client->DeleteFile($clk_ior); -$SV = $server->CreateProcess ("../../Time_Service/tao_costime_server", "-o $server_srv_ior"); -$CK = $server->CreateProcess ("../../Time_Service/tao_costime_clerk", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Time_Service/tao_costime_server", "-o $server_srv_ior"); +$CK = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Time_Service/tao_costime_clerk", "-f $clerk_srv_ior -o $clerk_clk_ior -t 2"); $CL = $client->CreateProcess ("client", "-f $client_clk_ior"); diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl index 0f4e1921ebb..dece4fd55a0 100755 --- a/TAO/orbsvcs/tests/Trading/run_test.pl +++ b/TAO/orbsvcs/tests/Trading/run_test.pl @@ -39,7 +39,7 @@ $import_test->DeleteFile($iorbase); my $export_ready_file = $export_test->LocalFile ($ready); $export_test->DeleteFile($ready); -$SV = $server->CreateProcess ("../../Trading_Service/tao_costrading", +$SV = $server->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Trading_Service/tao_costrading", "-ORBdebuglevel $debug_level ". "-ORBlogfile trader.log " . "-ORBEndpoint iiop://:$port " . diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index fde869f8cd3..927ae22006c 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -1,4 +1,3 @@ - // Implementation of Named Value List and NamedValue classes #include "tao/AnyTypeCode/NVList.h" @@ -23,7 +22,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object - CORBA::ULong CORBA::NamedValue::_incr_refcount (void) { @@ -369,7 +367,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) if (TAO_debug_level > 3) { TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n"))); + ACE_TEXT ("TAO (%P|%t) - NVList::_tao_decode\n"))); } // Then unmarshal each "in" and "inout" parameter. @@ -394,13 +392,12 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) if (TAO_debug_level > 3) { TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %C\n"), + ACE_TEXT ("TAO (%P|%t) - NVList::_tao_decode - <%C>\n"), nv->name ()? nv->name () : "(no name given)" )); } CORBA::Any_ptr any = nv->value (); - any->impl ()->_tao_decode (incoming - ); + any->impl ()->_tao_decode (incoming); } } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index b902beda7d7..de360a3cdcb 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -75,12 +75,10 @@ namespace TAO virtual CORBA::Any * label (void) const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, - CORBA::TypeCode_ptr tc - ) const; + CORBA::TypeCode_ptr tc) const; //@} private: - /// IDL @c union case/member label value. ::CORBA::ULong const label_; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index 4249844effe..180747f1428 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -85,7 +85,6 @@ namespace TAO //@} protected: - /** * @name @c TAO CORBA::TypeCode Template Methods * @@ -94,28 +93,20 @@ namespace TAO * @see @c CORBA::TypeCode */ //@{ - virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc - ) const; - virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc - ) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i ( - void) const; + virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; virtual char const * id_i (void) const; virtual char const * name_i (void) const; virtual CORBA::ULong member_count_i (void) const; - virtual char const * member_name_i (CORBA::ULong index - ) const; - virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index - ) const; - virtual CORBA::Any * member_label_i (CORBA::ULong index - ) const; - virtual CORBA::TypeCode_ptr discriminator_type_i ( - void) const; + virtual char const * member_name_i (CORBA::ULong index) const; + virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; + virtual CORBA::Any * member_label_i (CORBA::ULong index) const; + virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; virtual CORBA::Long default_index_i (void) const; //@} private: - /** * @c Union Attributes * @@ -152,7 +143,6 @@ namespace TAO CORBA::TypeCode_ptr const *> const * const * const cases_; //@} - }; } // End namespace TypeCode diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index daed06aa949..294c0c21a37 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -145,8 +145,7 @@ public: TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= (_slice_type *); TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= ( - const TAO_FixedArray_Var_T<T,T_slice,TAG> & - ); + const TAO_FixedArray_Var_T<T,T_slice,TAG> &); _out_type out (void); @@ -175,8 +174,7 @@ public: TAO_VarArray_Var_T<T,T_slice,TAG> &operator= (_slice_type *); TAO_VarArray_Var_T<T,T_slice,TAG> &operator= ( - const TAO_VarArray_Var_T<T,T_slice,TAG> & - ); + const TAO_VarArray_Var_T<T,T_slice,TAG> &); _out_type out (void); @@ -206,8 +204,7 @@ public: TAO_Array_Out_T (const TAO_Array_Out_T<T,T_var,T_slice,TAG> &); TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= ( - const TAO_Array_Out_T<T,T_var,T_slice,TAG> & - ); + const TAO_Array_Out_T<T,T_var,T_slice,TAG> &); TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (_slice_type *); operator _slice_type *& (); diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp index 1641d7512a1..0357c45c70e 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp @@ -11,7 +11,6 @@ TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core) { } - void TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies) { diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 6c023bc48c6..0f3d7ebcf06 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -51,7 +51,6 @@ TAO_BidirectionalPolicy::copy (void) { // Future policy implementors: notice how the following code is // exception safe! - TAO_BidirectionalPolicy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this), CORBA::NO_MEMORY (TAO::VMCID, diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index d1db0b9f371..11071b6b018 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -39,7 +39,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CORBANAME_Parser : public TAO_IOR_Parser { public: - /// The destructor virtual ~TAO_CORBANAME_Parser (void); @@ -52,8 +51,7 @@ public: private: virtual CORBA::Object_ptr parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, - ACE_CString &key_string - ); + ACE_CString &key_string); }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser) diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 783dcf2fb1c..f9ff5707a93 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -67,9 +67,7 @@ public: /// Parse a string containing a URL style IOR and return an /// MProfile. - int make_mprofile (const char *ior, - TAO_MProfile &mprofile - ); + int make_mprofile (const char *ior, TAO_MProfile &mprofile); /// Create a profile based on the contents of @a cdr TAO_Profile* create_profile (TAO_InputCDR& cdr); diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h index 24f3ff5b36e..f4eee5ee4d8 100644 --- a/TAO/tao/Default_Collocation_Resolver.h +++ b/TAO/tao/Default_Collocation_Resolver.h @@ -35,10 +35,8 @@ class TAO_Export TAO_Default_Collocation_Resolver : public TAO_Collocation_Resolver { public: - /// Is @a object collocated? - virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object - ) const; + virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) const; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver) diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 30c269457a0..4076983b754 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -73,7 +73,6 @@ namespace CORBA class TAO_DynamicInterface_Export Context { public: - Context (void); ~Context (void); diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h index 342c4a99399..d094f14b454 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h +++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h @@ -39,7 +39,6 @@ class TAO_DynamicInterface_Export TAO_DII_Arguments_Converter_Impl : public TAO::Collocated_Arguments_Converter { public: - virtual void convert_request (TAO_ServerRequest & server_request, TAO::Argument * const args[], size_t nargs); diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index 705e783fea1..8c12cd82c57 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -81,7 +81,6 @@ namespace TAO virtual Dynamic::ParameterList *arguments (void); #endif /*TAO_HAS_INTERCEPTORS == 1*/ }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index eb49f2d14d6..fda3c80f2bf 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -95,10 +95,8 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time, - Invocation_Retry_State *retry_state) + Invocation_Retry_State *) { - ACE_UNUSED_ARG (retry_state); - // Simple sanity check if (this->mode_ != TAO_DII_INVOCATION || this->type_ != TAO_TWOWAY_INVOCATION) @@ -220,10 +218,8 @@ namespace TAO CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, ACE_Time_Value *&max_wait_time, - Invocation_Retry_State *retry_state) + Invocation_Retry_State *) { - ACE_UNUSED_ARG (retry_state); - // Simple sanity check if (this->mode_ != TAO_DII_DEFERRED_INVOCATION || this->type_ != TAO_TWOWAY_INVOCATION) @@ -254,7 +250,7 @@ namespace TAO // forward requested byte order synch._tao_byte_order (this->_tao_byte_order ()); - Invocation_Status status = synch.remote_invocation (max_wait_time); + Invocation_Status const status = synch.remote_invocation (max_wait_time); if (status == TAO_INVOKE_RESTART) { diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index 94edab69fb4..f06a07b7a62 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -96,7 +96,6 @@ namespace TAO virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count); protected: - virtual Invocation_Status invoke_twoway ( TAO_Operation_Details &op, CORBA::Object_var &effective_target, @@ -111,7 +110,6 @@ namespace TAO Collocation_Strategy strat); private: - CORBA::ExceptionList *exception_list_; CORBA::Request *request_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index f7cab432921..090fcae801d 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -52,9 +52,10 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( // datablocks of the stack. If this method is called twice, as is in // some cases where the same invocation object is used to make two // invocations like forwarding, the release becomes essential. - if (ACE_BIT_DISABLED (db->flags (), - ACE_Message_Block::DONT_DELETE)) - db->release (); + if (ACE_BIT_DISABLED (db->flags (), ACE_Message_Block::DONT_DELETE)) + { + db->release (); + } // Steal the buffer, that way we don't do any unnecessary copies of // this data. @@ -66,7 +67,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level >= 4) { TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"))); + ACE_TEXT ("TAO (%P|%t) - DII_Deferred_Reply_Dispatcher::dispatch_reply, id [%d]\n"), params.request_id_)); } try @@ -78,7 +79,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( { if (TAO_debug_level >= 4) { - ex._tao_print_exception ("TAO_Asynch_Reply_Dispatcher::dispatch_reply, exception during reply handler"); + ex._tao_print_exception ("DII_Deferred_Reply_Dispatcher::dispatch_reply, exception during reply handler"); } } @@ -91,7 +92,6 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( void TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) { - try { // Generate a fake exception.... @@ -110,8 +110,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) { if (TAO_debug_level >= 4) { - ex._tao_print_exception ( - "DII_Deferred_Reply_Dispacher::connection_closed"); + ex._tao_print_exception ("DII_Deferred_Reply_Dispacher::connection_closed"); } } @@ -153,17 +152,17 @@ TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply ( this->locate_reply_status_ = params.locate_reply_status (); // Transfer the <params.input_cdr_>'s content to this->reply_cdr_ - ACE_Data_Block *db = - this->reply_cdr_.clone_from (*params.input_cdr_); + ACE_Data_Block *db = this->reply_cdr_.clone_from (*params.input_cdr_); // See whether we need to delete the data block by checking the // flags. We cannot be happy that we initally allocated the // datablocks of the stack. If this method is called twice, as is in // some cases where the same invocation object is used to make two // invocations like forwarding, the release becomes essential. - if (ACE_BIT_DISABLED (db->flags (), - ACE_Message_Block::DONT_DELETE)) - db->release (); + if (ACE_BIT_DISABLED (db->flags (), ACE_Message_Block::DONT_DELETE)) + { + db->release (); + } // Steal the buffer, that way we don't do any unnecessary copies of // this data. @@ -175,8 +174,7 @@ TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level >= 4) { TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P | %t):") - ACE_TEXT ("TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply: status = %d\n"), + ACE_TEXT ("TAO (%P|%t) - TAO_DII_Asynch_Reply_Dispatcher::dispatch_reply: status = %d\n"), this->reply_status_)); } @@ -206,8 +204,7 @@ TAO_DII_Asynch_Reply_Dispatcher::connection_closed (void) try { // Generate a fake exception.... - CORBA::COMM_FAILURE comm_failure (0, - CORBA::COMPLETED_MAYBE); + CORBA::COMM_FAILURE comm_failure (0, CORBA::COMPLETED_MAYBE); TAO_OutputCDR out_cdr; @@ -224,8 +221,7 @@ TAO_DII_Asynch_Reply_Dispatcher::connection_closed (void) { if (TAO_debug_level >= 4) { - ex._tao_print_exception ( - "DII_Asynch_Reply_Dispacher::connection_closed"); + ex._tao_print_exception ("DII_Asynch_Reply_Dispacher::connection_closed"); } } diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index cf4008f0f6c..db7200985ed 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -56,8 +56,6 @@ namespace CORBA class TAO_DynamicInterface_Export ExceptionList { public: - // = Intialization and termination methods. - /// Constructor. ExceptionList (void); diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 261f1e08bd7..b2fc6791b79 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -43,7 +43,6 @@ CORBA::Request::_decr_refcount (void) } // DII Request class implementation - CORBA::Request::Request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, const CORBA::Char *op, @@ -381,7 +380,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, default: // @@ (JP) Don't know what to do about any of these yet. TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) unhandled reply status\n"))); + ACE_TEXT ("TAO (%P|%t) - Request::handle_response, unhandled reply status\n"))); } } diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 0560d577255..6613188666b 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -70,7 +70,6 @@ namespace CORBA class TAO_DynamicInterface_Export Request { public: - /// Return the target of this request. CORBA::Object_ptr target (void) const; @@ -155,7 +154,7 @@ namespace CORBA void handle_response (TAO_InputCDR &incoming, GIOP::ReplyStatusType reply_status); #if defined (TAO_HAS_AMI) - /// The 'asychronous' send method. The object is a DSI based callback + /// The 'asynchronous' send method. The object is a DSI based callback /// handler. This handler must implement Messaging::ReplyHandler void sendc (CORBA::Object_ptr handler); @@ -218,7 +217,6 @@ namespace CORBA ~Request (void); private: - /// Target object. CORBA::Object_ptr target_; diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index f8227bd21e2..e946d3179b8 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -19,7 +19,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DSI ServerRequest object. - CORBA::ULong CORBA::ServerRequest::_incr_refcount (void) { @@ -265,8 +264,7 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception) // to the original source of the reply. this->orb_server_request_.outgoing ()->write_octet_array ( reinterpret_cast<const CORBA::Octet *> (raw_exception.fast_rep ()), - static_cast<CORBA::ULong> (raw_exception.length () + ACE_CDR::MAX_ALIGNMENT) - ); + static_cast<CORBA::ULong> (raw_exception.length () + ACE_CDR::MAX_ALIGNMENT)); // This will prevent the marshaling of any parameters into this reply. this->sent_gateway_exception_ = true; diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index 60d1da1208d..1d77cf0ec79 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -44,7 +44,6 @@ namespace CORBA : public CORBA::UserException { public: - /// Constructor. UnknownUserException (void); @@ -85,9 +84,7 @@ namespace CORBA }; // The CORBA::UnknownUserException TypeCode. - extern TAO_DynamicInterface_Export TypeCode_ptr const - _tc_UnknownUserException; - + extern TAO_DynamicInterface_Export TypeCode_ptr const _tc_UnknownUserException; } // End CORBA namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index f7f82391dad..1b414fa7c6f 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -40,7 +40,7 @@ TAO_Exclusive_TMS::request_id (void) if (TAO_debug_level > 4) TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::request_id - <%d>\n"), + ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::request_id - [%d]\n"), this->request_id_generator_)); return this->request_id_generator_; @@ -82,7 +82,7 @@ TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) { if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::dispatch_reply - <%d != %d>\n"), + ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::dispatch_reply - [%d] != [%d]\n"), this->request_id_, params.request_id_)); // The return value 0 informs the transport that the mux strategy @@ -107,7 +107,7 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id) { if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::reply_timed_out - <%d != %d>\n"), + ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::reply_timed_out - [%d] != [%d]\n"), this->request_id_, request_id)); // The return value 0 informs the transport that the mux strategy diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp index 1cb49937aaf..66e0dbfb0d9 100644 --- a/TAO/tao/Fixed_Array_Argument_T.cpp +++ b/TAO/tao/Fixed_Array_Argument_T.cpp @@ -13,8 +13,7 @@ template<typename S_forany, template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::marshal ( - TAO_OutputCDR & cdr - ) + TAO_OutputCDR & cdr) { return cdr << this->x_; } diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 8fb6aace961..78a429daa0a 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -46,7 +46,6 @@ class TAO_ServerRequest; class TAO_GIOP_Message_Generator_Parser { public: - virtual ~TAO_GIOP_Message_Generator_Parser (void); /// Write the request header in to @a msg diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 9e2aebc545e..936913a0b27 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -31,7 +31,6 @@ class TAO_GIOP_Message_Generator_Parser_10: public TAO_GIOP_Message_Generator_Parser { public: - /// Write the request header in to @a msg virtual bool write_request_header ( const TAO_Operation_Details &opdetails, diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index 6faa5876b01..23f5c33822c 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -35,7 +35,6 @@ class TAO_GIOP_Message_Generator_Parser_11 public: /// Our minor version virtual CORBA::Octet minor_version (void) const; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index 611a2e369d1..b188879bdfb 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -34,7 +34,6 @@ class TAO_GIOP_Message_Generator_Parser_12 : public TAO_GIOP_Message_Generator_Parser { public: - /// Write the request header in to @a msg virtual bool write_request_header ( const TAO_Operation_Details &opdetails, @@ -89,9 +88,7 @@ public: virtual size_t fragment_header_length (void) const; private: - /// Marshall the TargetSpecification - /// This method may be required for other GIOP version coming out /// later than 1.2. We need to share this method bool marshall_target_spec (TAO_Target_Specification &spec, diff --git a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h index 80e3587747b..69c66192b67 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h @@ -38,7 +38,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_GIOP_Message_Generator_Parser_Impl { public: - /// Performs a check of the revision numbers static CORBA::Boolean check_revision (CORBA::Octet incoming_major, CORBA::Octet incoming_minor); diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h index da7ea0fb3b7..7192fbc14dd 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.h +++ b/TAO/tao/GIOP_Message_Locate_Header.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_GIOP_Locate_Request_Header { public: - /// Constructor TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg, TAO_ORB_Core *core); diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 92191e70732..8245ff6842b 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -38,7 +38,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Export TAO_GIOP_Message_State { public: - /// Constructor TAO_GIOP_Message_State (void); diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index 36451cd2e41..517c40658fa 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -37,7 +37,6 @@ class TAO_ORB_Core; class TAO_Export TAO_GIOP_Message_Version { public: - /// Major version number CORBA::Octet major; diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 66900bc5dc8..c9f13c78cff 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -477,7 +477,7 @@ TAO_IIOP_Connection_Handler::add_transport_to_cache (void) if (this->peer ().get_remote_addr (addr) == -1) return -1; - // Construct an IIOP_Endpoint object + // Construct an IIOP_Endpoint object TAO_IIOP_Endpoint endpoint ( addr, this->orb_core()->orb_params()->cache_incoming_by_dotted_decimal_address ()); diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index c40bf59940c..0992972b9d7 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -788,7 +788,6 @@ TAO_IIOP_Connector::cancel_svc_handler ( return -1; } - //@@ TAO_CONNECTOR_SPL_COPY_HOOK_END TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 98ac45043b1..33b614739de 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -88,5 +88,4 @@ ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Protocol_Factory) TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index cace95cd9a1..c3429bb15e9 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -36,7 +36,6 @@ template <class OBJ, class ACE_LOCK> class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_LOCK> { public: - /// take ownership of obj. TAO_Intrusive_Ref_Count_Object (OBJ* obj); virtual ~TAO_Intrusive_Ref_Count_Object (void); @@ -44,7 +43,6 @@ public: OBJ* get () const; private: - // Prevent default constructor used. TAO_Intrusive_Ref_Count_Object (void); diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index ce68e95f94e..9c168b12f9c 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -108,7 +108,6 @@ TAO_LF_CH_Event::validate_state_change (LFS_STATE new_state) return; } - bool TAO_LF_CH_Event::successful_i (void) const { diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h index cb22cd48325..0f9a99c40e1 100644 --- a/TAO/tao/LF_CH_Event.h +++ b/TAO/tao/LF_CH_Event.h @@ -56,7 +56,6 @@ public: //@{ protected: - /// Check whether we have reached the final state.. virtual bool is_state_final (void) const; @@ -114,7 +113,6 @@ private: virtual int unbind (TAO_LF_Follower *follower); private: - /// The previous state that the LF_CH_Event was in LFS_STATE prev_state_; diff --git a/TAO/tao/Message_Semantics.h b/TAO/tao/Message_Semantics.h index b14110cf639..5dba142877a 100644 --- a/TAO/tao/Message_Semantics.h +++ b/TAO/tao/Message_Semantics.h @@ -43,8 +43,6 @@ struct TAO_Message_Semantics : type_ (type), mode_ (TAO_SYNCH_MODE) {} TAO_Message_Semantics (Type type, Mode mode) : type_ (type), mode_ (mode) {} - TAO_Message_Semantics (const TAO_Message_Semantics& ms) - : type_ (ms.type_), mode_ (ms.mode_) {} Type type_; Mode mode_; diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index c251bcf0df5..ed3b08b2b17 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -262,12 +262,10 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd, this->rh_reply_status_ = TAO_RS_SENDING; } - TAO_Pluggable_Reply_Params_Base reply_params; reply_params.request_id_ = this->request_id_; reply_params.svc_ctx_.length (0); - reply_params.service_context_notowned - (&this->reply_service_context_.service_info ()); + reply_params.service_context_notowned (&this->reply_service_context_.service_info ()); reply_params.argument_flag_ = true; if (is_perm) { diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index 65677de2656..3b9da61a265 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -49,7 +49,7 @@ TAO_Asynch_Timeout_Handler::handle_timeout (const ACE_Time_Value &, { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Timeout_Handler") - ACE_TEXT ("::handle_timeout, request %d timed out\n"), + ACE_TEXT ("::handle_timeout, request [%d] timed out\n"), this->request_id_)); } } @@ -59,7 +59,7 @@ TAO_Asynch_Timeout_Handler::handle_timeout (const ACE_Time_Value &, { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO_Messaging (%P|%t) - Asynch_Timeout_Handler") - ACE_TEXT ("::handle_timeout, unable to dispatch timed out request %d\n"), + ACE_TEXT ("::handle_timeout, unable to dispatch timed out request [%d]\n"), this->request_id_)); } } diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index e9a6c678745..e7d9022413a 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -50,7 +50,7 @@ TAO_Muxed_TMS::request_id (void) if (TAO_debug_level > 4) TAOLIB_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Muxed_TMS[%d]::request_id, <%d>\n", + "TAO (%P|%t) - Muxed_TMS[%d]::request_id, [%d]\n", this->transport_->id (), this->request_id_generator_)); @@ -83,9 +83,9 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, if (result != 0) { if (TAO_debug_level > 0) - TAOLIB_DEBUG ((LM_DEBUG, + TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::bind_dispatcher, ") - ACE_TEXT ("bind dispatcher failed: result = %d, request id = %d\n"), + ACE_TEXT ("bind dispatcher failed: result = %d, request id [%d]\n"), result, request_id)); return -1; @@ -136,7 +136,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) if (TAO_debug_level > 8) TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ") - ACE_TEXT ("id = %d\n"), + ACE_TEXT ("id [%d]\n"), params.request_id_)); // Dispatch the reply. @@ -148,7 +148,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::dispatch_reply, ") - ACE_TEXT ("unbind dispatcher failed, id %d: result = %d\n"), + ACE_TEXT ("unbind dispatcher failed, id [%d], result = %d\n"), params.request_id_, result)); @@ -185,7 +185,7 @@ TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id) { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::reply_timed_out, ") - ACE_TEXT ("id = %d\n"), + ACE_TEXT ("id [%d]\n"), request_id)); } @@ -202,7 +202,7 @@ TAO_Muxed_TMS::reply_timed_out (CORBA::ULong request_id) if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Muxed_TMS::reply_timed_out, ") - ACE_TEXT ("unbind dispatcher failed, id %d: result = %d\n"), + ACE_TEXT ("unbind dispatcher failed, id [%d] result = %d\n"), request_id, result)); diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 40da1458847..9902218d076 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -486,8 +486,7 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( CORBA::Short priority, CORBA::Short &min_priority, CORBA::Short &max_priority, - bool &in_range - ) + bool &in_range) { RTCORBA::PriorityBandedConnectionPolicy_var bands_policy_ptr = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands_policy); @@ -583,8 +582,7 @@ TAO_RT_Protocols_Hooks::get_thread_implicit_CORBA_priority (CORBA::Short &priori int TAO_RT_Protocols_Hooks::restore_thread_CORBA_and_native_priority ( CORBA::Short priority, - CORBA::Short native_priority - ) + CORBA::Short native_priority) { // Only used for restoration of values that were previously set / // checked when so no need to re-apply the mapping. diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index c6c43ce7210..fff8a5119b9 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -37,8 +37,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ) + TAO_Object_Adapter *object_adapter) : TAO_Regular_POA (name, poa_manager, policies, @@ -77,8 +76,7 @@ TAO_RT_POA::new_POA (const String &name, lock, thread_lock, orb_core, - object_adapter - ), + object_adapter), CORBA::NO_MEMORY ()); return poa; @@ -299,8 +297,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key, // POA. If there are no bands, all the thread lanes are used. CORBA::Policy_var bands = this->policies ().get_cached_policy ( - TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION - ); + TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION); RTCORBA::PriorityBandedConnectionPolicy_var priority_bands = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()); diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index ba263aa1bd9..37b2c37a234 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -2796,7 +2796,7 @@ TAO_Transport::post_open (size_t id) if (TAO_debug_level > 9) { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport::post_open, ") - ACE_TEXT ("tport id changed from [%d] to [%d]\n"), this->id_, id)); + ACE_TEXT ("transport id changed from [%d] to [%d]\n"), this->id_, id)); } this->id_ = id; diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index 0035cadcd2d..0dab65921c7 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -726,7 +726,7 @@ namespace TAO { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::fill_set_i, ") - ACE_TEXT ("current_size = %d, cache_maximum = %d\n"), + ACE_TEXT ("current_size [%d], cache_maximum [%d]\n"), current_size, cache_maximum)); } diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index e6f2bdfeca3..6a47a484bf3 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -944,7 +944,7 @@ TAO_Connector::wait_for_connection_completion ( TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Connector::") ACE_TEXT ("wait_for_connection_completion, ") - ACE_TEXT ("transport [%d]\n"), + ACE_TEXT ("winner transport [%d]\n"), the_winner->id ())); } } diff --git a/TAO/tests/IDLv4/annotations/be_init.cpp b/TAO/tests/IDLv4/annotations/be_init.cpp index cdde0a1562e..d0082601d3d 100644 --- a/TAO/tests/IDLv4/annotations/be_init.cpp +++ b/TAO/tests/IDLv4/annotations/be_init.cpp @@ -82,7 +82,8 @@ public: ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Annotation Test: %C: ") ACE_TEXT ("FAILED because of syntax error in:\n%C\n") - ACE_TEXT ("Check Syntax Error Message Above For More Infomation\n"), + ACE_TEXT ("Check syntax error message above for more information.\n"), + ACE_TEXT ("Failures beyond this might be false positives.\n"), name_, idl_)); ++failed_test_count; } @@ -712,6 +713,21 @@ BE_post_init (char *[], long) t.assert_annotation_member_value (value, constant_annotation_x); } catch (Failed const &) {} + AST_Annotation_Decl *boolean_annotation = 0; + try { + Annotation_Test t ("Annotation Declaration with Single Boolean"); + boolean_annotation = t.run ( + "@annotation boolean_annotation {\n" + " boolean value default TRUE;\n" + "};\n" + ).assert_annotation_decl ("@boolean_annotation"); + t.assert_annotation_member_count (boolean_annotation, 1); + AST_Annotation_Member *value = + t.get_annotation_member (boolean_annotation, "value"); + t.assert_annotation_member_type (value, AST_Expression::EV_bool); + t.assert_annotation_member_value<bool, ACE_CDR::Boolean> (value, true); + } catch (Failed const &) {} + /* ------------------------------------------------------------------------- * Annotations Applications * ------------------------------------------------------------------------- @@ -1169,6 +1185,62 @@ BE_post_init (char *[], long) } } catch (Failed const &) {} + try { + Annotation_Test t ("Annotation Application with Single Boolean"); + t.run ( + "struct struct13 {\n" + " @boolean_annotation\n" + " short test_member_1;\n" + " @boolean_annotation (TRUE)\n" + " short test_member_2;\n" + " @boolean_annotation (FALSE)\n" + " short test_member_3;\n" + " @boolean_annotation (value = TRUE)\n" + " short test_member_4;\n" + " @boolean_annotation (value = FALSE)\n" + " short test_member_5;\n" + "};\n" + ); + + AST_Decl *struct_member = 0; + AST_Annotation_Appl *appl = 0; + + struct_member = t.assert_node ("struct13::test_member_1"); + t.assert_annotation_appl_count (struct_member, 1); + appl = t.assert_annotation_appl (struct_member, 0, boolean_annotation); + t.assert_annotation_member_count (appl, 1); + t.assert_annotation_member_value<bool, ACE_CDR::Boolean> ( + t.get_annotation_member (appl, "value"), true); + + struct_member = t.assert_node ("struct13::test_member_2"); + t.assert_annotation_appl_count (struct_member, 1); + appl = t.assert_annotation_appl (struct_member, 0, boolean_annotation); + t.assert_annotation_member_count (appl, 1); + t.assert_annotation_member_value<bool, ACE_CDR::Boolean> ( + t.get_annotation_member (appl, "value"), true); + + struct_member = t.assert_node ("struct13::test_member_3"); + t.assert_annotation_appl_count (struct_member, 1); + appl = t.assert_annotation_appl (struct_member, 0, boolean_annotation); + t.assert_annotation_member_count (appl, 1); + t.assert_annotation_member_value<bool, ACE_CDR::Boolean> ( + t.get_annotation_member (appl, "value"), false); + + struct_member = t.assert_node ("struct13::test_member_4"); + t.assert_annotation_appl_count (struct_member, 1); + appl = t.assert_annotation_appl (struct_member, 0, boolean_annotation); + t.assert_annotation_member_count (appl, 1); + t.assert_annotation_member_value<bool, ACE_CDR::Boolean> ( + t.get_annotation_member (appl, "value"), true); + + struct_member = t.assert_node ("struct13::test_member_5"); + t.assert_annotation_appl_count (struct_member, 1); + appl = t.assert_annotation_appl (struct_member, 0, boolean_annotation); + t.assert_annotation_member_count (appl, 1); + t.assert_annotation_member_value<bool, ACE_CDR::Boolean> ( + t.get_annotation_member (appl, "value"), false); + } catch (Failed const &) {} + /* ------------------------------------------------------------------------- * Annotation Names * ------------------------------------------------------------------------- diff --git a/TAO/tests/IOR_Endpoint_Hostnames/run_test.pl b/TAO/tests/IOR_Endpoint_Hostnames/run_test.pl index 6d16ff94e37..204257f4e6f 100755 --- a/TAO/tests/IOR_Endpoint_Hostnames/run_test.pl +++ b/TAO/tests/IOR_Endpoint_Hostnames/run_test.pl @@ -42,7 +42,7 @@ $server->DeleteFile($database); $LI = $server->CreateProcess ("list_interfaces"); $GI = $server->CreateProcess ("generate_ior"); -$CI = $server->CreateProcess ("../../utils/catior/tao_catior", +$CI = $server->CreateProcess ("$ENV{TAO_ROOT}/utils/catior/tao_catior", "-f $server_iorfile"); open (OLDOUT, ">&STDOUT"); diff --git a/TAO/tests/Monitor/Marshal_Buffer/run_test.pl b/TAO/tests/Monitor/Marshal_Buffer/run_test.pl index ae1faccc385..720e4e6490b 100755 --- a/TAO/tests/Monitor/Marshal_Buffer/run_test.pl +++ b/TAO/tests/Monitor/Marshal_Buffer/run_test.pl @@ -40,7 +40,7 @@ $SV1 = $server1->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server1_iorfile1"); -$SV2 = $server2->CreateProcess ("../../../utils/monitor/monitor_client", +$SV2 = $server2->CreateProcess ("$ENV{TAO_ROOT}/utils/monitor/monitor_client", "-k \"file://$server2_iorfile2\" " . "-p \"Output CDR Buffer\" " . "-p \"OS/Processor/CPULoad\" " . diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl index 4e20912b041..4b86d411fa5 100755 --- a/TAO/utils/nslist/run_test.pl +++ b/TAO/utils/nslist/run_test.pl @@ -36,16 +36,15 @@ $server4->DeleteFile ($naming_ior); $client->DeleteFile ($naming_ior); -$NS = $server1->CreateProcess ("../../orbsvcs/Naming_Service/tao_cosnaming", ""); +$NS = $server1->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", ""); $LS = $server2->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nslist", ""); $AD = $server3->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nsadd", ""); $DL = $server4->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nsdel", ""); -$CL = $client->CreateProcess ("../../orbsvcs/tests/Simple_Naming/client", ""); +$CL = $client->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/tests/Simple_Naming/client", ""); # We want the nslist and nsadd executables to be found exactly in the path # given, without being modified by the value of -ExeSubDir. # So, we tell their Process objects to ignore the setting of -ExeSubDir. - $LS->IgnoreExeSubDir (1); $AD->IgnoreExeSubDir (1); $DL->IgnoreExeSubDir (1); diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 601fedab6d9..9d6b0951d27 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,18 +116,6 @@ jobs: vcpkgarch: x64-windows vcpkglibdir: lib vcpkgpackages: openssl xerces-c - Debug32: - BuildPlatform: Win32 - BuildConfiguration: Debug - vcpkgarch: x86-windows - vcpkglibdir: debug\lib - vcpkgpackages: openssl xerces-c - Release32: - BuildPlatform: Win32 - BuildConfiguration: Release - vcpkgarch: x86-windows - vcpkglibdir: lib - vcpkgpackages: openssl xerces-c variables: VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include @@ -272,6 +260,12 @@ jobs: PackageDeps: clang-7 Repo: llvm-toolchain-$(lsb_release -cs)-7 platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU + CLANG8: + CC: clang-8 + CXX: clang++-8 + PackageDeps: clang-8 + Repo: llvm-toolchain-$(lsb_release -cs)-8 + platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU steps: - script: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - @@ -310,7 +304,7 @@ jobs: - job: MacOSX timeoutInMinutes: 90 pool: - vmImage: macOS-10.13 + vmImage: macOS-10.14 steps: - powershell: | '#include "ace/config-macosx.h"' > $(ACE_ROOT)/ace/config.h |