diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-10-13 17:24:13 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-10-13 17:24:13 +0000 |
commit | bf5d6a5a54976d0cd4a1794f6ce5bb38c96fce2f (patch) | |
tree | 66a76791b4c4cf732dcee6cb6da4cba3dc2dd82b /TAO/tao/ImR_Client | |
parent | 98aebcde3314c322c9fb33651da2979030e318d7 (diff) | |
download | ATCD-bf5d6a5a54976d0cd4a1794f6ce5bb38c96fce2f.tar.gz |
Mon Oct 13 17:25:22 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Naming/Naming_Server.h:
Doxygen improvements
* orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
Removed duplicate include
* orbsvcs/tests/ImplRepo/NameService/test.cpp:
Zapped empty lines
* orbsvcs/tests/ImplRepo/RestartServer/Messenger.idl:
* orbsvcs/tests/ImplRepo/RestartServer/Terminator.h:
Layout changes
* tao/ImR_Client/ImR_Client.cpp:
Unicode logging fixes
* tao/ImR_Client/ImplRepo.idl:
Doxygen fixes
Diffstat (limited to 'TAO/tao/ImR_Client')
-rw-r--r-- | TAO/tao/ImR_Client/ImR_Client.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/ImR_Client/ImplRepo.idl | 20 |
2 files changed, 10 insertions, 14 deletions
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index a1fbeed3272..c62aeb6c9d0 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -238,7 +238,7 @@ namespace TAO imr_info = ACE_CString (", IMR IOR=") + ior.in (); } TAOLIB_DEBUG ((LM_DEBUG, - ACE_TEXT ("Notifying ImR of startup%s\n"), + ACE_TEXT ("Notifying ImR of startup%C\n"), imr_info.c_str ())); } @@ -304,7 +304,7 @@ namespace TAO if (TAO_debug_level > 0) { TAOLIB_DEBUG((LM_INFO, - "\n\nfull_ior=<%s>\n\nior=<%s>\n\n", + "\n\nfull_ior=<%C>\n\nior=<%C>\n\n", full_ior.in(), ior.in())); } diff --git a/TAO/tao/ImR_Client/ImplRepo.idl b/TAO/tao/ImR_Client/ImplRepo.idl index 6c5a1af8e57..8c427adbe34 100644 --- a/TAO/tao/ImR_Client/ImplRepo.idl +++ b/TAO/tao/ImR_Client/ImplRepo.idl @@ -126,29 +126,29 @@ module ImplementationRepository { /// Activate server that is named @a server. /// - /// The <NotFound> exception is raised when <server> is not found - /// in the Implementation Repository. The <CannotActivate> exception - /// is raised when <server> is found in the Repository but could not be + /// The @c NotFound exception is raised when @a server is not found + /// in the Implementation Repository. The @c CannotActivate exception + /// is raised when @a server is found in the Repository but could not be /// activated. void activate_server (in string server) raises (NotFound, CannotActivate); /// Add/Update the the @a server. - /// The <NotFound> exception is raised when the activator specified + /// The @c NotFound exception is raised when the activator specified /// in the options is not registered. void add_or_update_server (in string server, in StartupOptions options) raises(NotFound); /// Remove @a server from the Implementation Repository. /// - /// The <NotFound> exception is raised when @a server is not found + /// The @c NotFound exception is raised when @a server is not found /// in the Implementation Repository. void remove_server (in string server) raises (NotFound); /// Tries to shutdown the server, first gracefully, then ungracefully. /// - /// The <NotFound> exception is raised when @a server is not found + /// The @c NotFound exception is raised when @a server is not found /// in the Implementation Repository. void shutdown_server (in string server) raises (NotFound); @@ -156,7 +156,7 @@ module ImplementationRepository /// Used to notify the Implementation Repository that @a server is alive /// and well at @a partial_ior. /// - /// The <NotFound> exception is raised when @a server is not found + /// The @c NotFound exception is raised when @a server is not found /// in the Implementation Repository. void server_is_running (in string server, in string partial_ior, @@ -166,7 +166,7 @@ module ImplementationRepository /// Used to tell the Implementation Repository that @a server is shutting /// down. /// - /// The <NotFound> exception is raised when <server> is not found + /// The @c NotFound exception is raised when @a server is not found /// in the Implementation Repository. void server_is_shutting_down (in string server) @@ -193,9 +193,6 @@ module ImplementationRepository oneway void shutdown(in boolean activators, in boolean servers); }; - - - /** * @brief The Extended Implementation Repository Administration Interface * @@ -211,7 +208,6 @@ module ImplementationRepository void kill_server (in string server, in short signum) raises(NotFound, CannotComplete); }; - }; #endif /* TAO_IMRCLIENT_IMPLREPO_PIDL */ |