diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:13:22 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:13:22 +0000 |
| commit | dd191a1bd23eb3876b72894037590d53bb4385da (patch) | |
| tree | a3a0838f8405c73a8c85f27d39553eca5d2fa573 | |
| parent | 2c25b795ac89dc7d2f18077b8e9f6c6133722fe9 (diff) | |
| download | ATCD-dd191a1bd23eb3876b72894037590d53bb4385da.tar.gz | |
ChangeLogTag: Fri Aug 25 16:51:17 2000 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/Naming_Service/Naming_Service.cpp | 9 |
2 files changed, 18 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 672336d5eed..c32a9fd2a8b 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -26,6 +26,17 @@ Fri Aug 25 16:59:35 2000 Balachandran Natarajan <bala@cs.wustl.edu> creating dependencies. That seem to break on every alternate platform. +Fri Aug 25 16:51:17 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h: + * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp: + + * orbsvcs/orbsvcs/Trader/Trading_Loader.h: + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: + Modified and added some macros. + + * orbsvcs/Naming_Service/Naming_Service.cpp: + Added a pair of braces enclosing a for loop to satisy Win32. Fri Aug 25 15:47:50 2000 Jeff Parsons <parsons@cs.wustl.edu> @@ -40,6 +51,7 @@ Fri Aug 25 11:20:13 2000 Priyanka Gontla <pgontla@ece.uci.edu> * orbsvcs/tests/Interoperable_Naming/Makefile: Modified the order in which the files are compiled. +>>>>>>> 1.1308 Thu Aug 24 21:03:11 2000 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/Makefile: diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index 6f0dc17b65d..175787dd765 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -86,9 +86,12 @@ TAO_Naming_Service::parse_args (int argc, // Remove the option '-t' from argv [] // to avoid any confusion that might result. - for (i = count_argv; i != argc; ++i) - argv [i] = argv [i+2]; - + { + // Added unneeded '{ & }' just to satisfy Win32 + for (i = count_argv; i != argc; ++i) + argv [i] = argv [i+2]; + } + // Decrement the value of this->argc_ to reflect the removal // of '-t' option. argc = argc-2; |