diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-11-11 01:11:38 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-11-11 01:11:38 +0000 |
| commit | 8290bdcf2ad9f02a4bf900050740b3ac926b1c98 (patch) | |
| tree | 3365eead9feb03e6e1291a027578e6512335d79b | |
| parent | 3dfda06682992cfc3f8d4884c7a060eca033a1e5 (diff) | |
| download | ATCD-8290bdcf2ad9f02a4bf900050740b3ac926b1c98.tar.gz | |
ChangeLogTag:Sat Nov 10 17:16:59 2001 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp | 8 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Factory.cpp | 12 | ||||
| -rw-r--r-- | THANKS | 1 |
5 files changed, 22 insertions, 14 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 815ca673b00..22b8cff6f39 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sat Nov 10 19:08:06 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * tao/Strategies/SHMIOP_Factory.cpp (init): + * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp (init): + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp (init): + Added some more fixes for the "const" changes to + ACE_Arg_Shifter. Thanks to Craig Rodrigues for providing these. + Sat Nov 10 16:31:10 2001 Priyanka Gontla <pgontla@ece.uci.edu> * tao/ORB_Core.cpp (init): diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index b2a42815c42..9ec5f5b75ac 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -134,9 +134,10 @@ TAO_CEC_Default_Factory::init (int argc, char* argv[]) if (arg_shifter.is_parameter_next ()) { - const char* opt = arg_shifter.get_current (); - this->consumer_collection_ = - this->parse_collection_arg (opt); + const char *current_arg = arg_shifter.get_current (); + char *opt = ACE_OS::strdup (current_arg); + this->consumer_collection_ = this->parse_collection_arg (opt); + ACE_OS::free (opt); arg_shifter.consume_arg (); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index bb9a8e4dbb3..6c8c0dd4902 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -200,13 +200,14 @@ TAO_EC_Default_Factory::init (int argc, char* argv[]) if (arg_shifter.is_parameter_next ()) { - const char* opt = arg_shifter.get_current (); + const char *current_arg = arg_shifter.get_current (); + char *opt = ACE_OS::strdup (current_arg); int collection_type = 0; int synch_type = 0; int iteration_type = 0; - char* aux; - for (char* arg = ACE_OS::strtok_r (opt, ":", &aux); + char *aux; + for (char *arg = ACE_OS::strtok_r (opt, ":", &aux); arg != 0; arg = ACE_OS::strtok_r (0, ":", &aux)) { @@ -232,6 +233,7 @@ TAO_EC_Default_Factory::init (int argc, char* argv[]) "unknown collection modifier <%s>\n", arg)); } + ACE_OS::free (opt); this->consumer_collection_ = (synch_type << 8) |(collection_type << 4) | iteration_type; arg_shifter.consume_arg (); diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 0faef1bd82c..4c0ade319ea 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -68,18 +68,14 @@ TAO_SHMIOP_Protocol_Factory::init (int argc, while (arg_shifter.is_anything_left ()) { - char *current_arg = 0; + const char *current_arg = 0; - if ((current_arg = arg_shifter.get_the_parameter - ("-MMAPFileSize"))) + if ((current_arg = arg_shifter.get_the_parameter ("-MMAPFileSize"))) { - this->min_bytes_ = - ACE_OS::atoi (current_arg); - + this->min_bytes_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter - ("-MMAPFilePrefix"))) + else if ((current_arg = arg_shifter.get_the_parameter ("-MMAPFilePrefix"))) { this->mmap_prefix_ = ACE::strnew (current_arg); arg_shifter.consume_arg (); @@ -1365,6 +1365,7 @@ Hartmut Quast <HartmutQuast@t-online.de> Ulrich Voigt <Ulrich.Voigt@ddg.de> Syed Wasim Ali <syed.ali@neustar.com> Bo Balder <bba@post.utfors.se> +Michael Sawczyn <msawczyn@columbus.rr.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile |