diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-23 10:39:42 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-02-23 10:39:42 +0000 |
| commit | cceaac2420377040eb5e92a3c6ab41c654e7400b (patch) | |
| tree | ddf3ad02e8e58e2bdf1962ac9f85a3dece2c6ed8 | |
| parent | f9738f25efb7ec889c9080c2a7ba1fbf47137099 (diff) | |
| download | ATCD-cceaac2420377040eb5e92a3c6ab41c654e7400b.tar.gz | |
Tue Feb 23 10:35:39 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>
* tao/TAO_Internal.cpp:
Changed a code layout for return values in forward declarations
according to TAO code conventions. Thanks to Johnny Willemsen
<jwillemsen at remedy dot nl> for pointing this out.
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 47 |
2 files changed, 34 insertions, 20 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 86d1ca22fbd..b6162eea89b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 23 10:35:39 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * tao/TAO_Internal.cpp: + Changed a code layout for return values in forward declarations + according to TAO code conventions. Thanks to Johnny Willemsen + <jwillemsen at remedy dot nl> for pointing this out. + Tue Feb 23 09:46:57 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> * tests/Bug_3827_Regression/test.cpp: diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 309ce2cca1b..a2e97b1fc33 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -64,10 +64,11 @@ namespace * sets apply_values to true * */ - int parse_global_args_i (int &argc, - ACE_TCHAR **argv, - ACE_ARGV &svc_config_argv, - bool apply_values); + int + parse_global_args_i (int &argc, + ACE_TCHAR **argv, + ACE_ARGV &svc_config_argv, + bool apply_values); /** * Parses the supplied command-line arguments to extract any that @@ -79,9 +80,10 @@ namespace * @brief Modifies the argc to reflect any arguments it has * "consumed" */ - int parse_svcconf_args_i (int &argc, - ACE_TCHAR **argv, - ACE_ARGV &svc_config_argv); + int + parse_svcconf_args_i (int &argc, + ACE_TCHAR **argv, + ACE_ARGV &svc_config_argv); /** * Checks if there is -ORBGestalt option with non-GLOBAL value. @@ -94,8 +96,9 @@ namespace * not become default for other ORBs created after it. This function * allows to avoid the above situation. */ - bool using_global_gestalt_i (int &argc, - ACE_TCHAR **argv); + bool + using_global_gestalt_i (int &argc, + ACE_TCHAR **argv); /** * Initialize the ACE Service Configurator with the process-global @@ -114,8 +117,10 @@ namespace * reentrant meaning that it is really no longer necessary to * do so. */ - void register_global_services_i (ACE_Service_Gestalt * pcfg); - void register_additional_services_i (ACE_Service_Gestalt * pcfg); + void + register_global_services_i (ACE_Service_Gestalt * pcfg); + void + register_additional_services_i (ACE_Service_Gestalt * pcfg); /** * Parses the supplied command-line arguments to extract any @@ -124,10 +129,11 @@ namespace * @brief Modifies the argc to reflect any arguments it has * "consumed" */ - int parse_private_args_i (int &argc, - ACE_TCHAR **argv, - ACE_ARGV & svc_config_argv, - bool & skip_service_config_open); + int + parse_private_args_i (int &argc, + ACE_TCHAR **argv, + ACE_ARGV & svc_config_argv, + bool & skip_service_config_open); /** * Initialize ORB-local (private) ACE Service Configurator @@ -136,11 +142,12 @@ namespace * @return @c 0 if successful, @c -1 with @c errno set if failure. * */ - int open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, - int & argc, - ACE_TCHAR **argv, - bool skip_service_config_open = false, - bool ignore_default_svc_conf_file = false); + int + open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, + int & argc, + ACE_TCHAR **argv, + bool skip_service_config_open = false, + bool ignore_default_svc_conf_file = false); /** * Number of times open_services() has been called. Incremented by |