diff options
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | TAO/tao/giop.h | 18 | ||||
| -rw-r--r-- | ace/High_Res_Timer.cpp | 8 | ||||
| -rw-r--r-- | ace/OS.i | 24 | ||||
| -rw-r--r-- | ace/Remote_Name_Space.cpp | 6 |
5 files changed, 28 insertions, 29 deletions
@@ -474,6 +474,7 @@ Steven Wohlever <wohlever@mitre.org> Manojkumar Acharya <mja@cvsf325.gpt.co.uk> Evgeny Beskrovny <evgeny_beskrovny@icomverse.com> Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch> +Laura Paterno <lpaterno@d0chb.fnal.gov> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson and is now at ObjectSpace. Paul devised the recursive diff --git a/TAO/tao/giop.h b/TAO/tao/giop.h index 7fe76204916..1a509a645e6 100644 --- a/TAO/tao/giop.h +++ b/TAO/tao/giop.h @@ -251,12 +251,12 @@ struct TAO_GIOP_LocateReplyHeader }; class TAO_GIOP_Invocation -// = TITLE -// Invocation: Sends a Request, optionally reads associated Reply. -// Uses transport info passed in, doesn't locate anything. -// -// = NOTES -// This should maybe be moved into its own file (invoke.h?) + // = TITLE + // Invocation: Sends a Request, optionally reads associated Reply. + // Uses transport info passed in, doesn't locate anything. + // + // = NOTES + // This should maybe be moved into its own file (invoke.h?) { public: TAO_GIOP_Invocation (IIOP_Object *data, @@ -285,11 +285,11 @@ private: // @@ Please add comments. IIOP_Object *data_; - const char *opname; + const char *opname_; - CORBA::Boolean do_rsvp; + CORBA::Boolean do_rsvp_; - CORBA::ULong my_request_id; + CORBA::ULong my_request_id_; u_char buffer [CDR::DEFAULT_BUFSIZE]; CDR stream_; diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp index 78cf8b1225c..4b311f5cbf3 100644 --- a/ace/High_Res_Timer.cpp +++ b/ace/High_Res_Timer.cpp @@ -198,8 +198,8 @@ ACE_High_Res_Timer::print_ave (const char *str, const int count, ACE_HANDLE hand ACE_OS::sprintf (buf, " total %3lu.%06lu secs\n", total_secs, (extra_nsecs + 500) / 1000); - ACE_OS::write (handle, str, strlen (str)); - ACE_OS::write (handle, buf, strlen (buf)); + ACE_OS::write (handle, str, ACE_OS::strlen (str)); + ACE_OS::write (handle, buf, ACE_OS::strlen (buf)); } void @@ -232,8 +232,8 @@ ACE_High_Res_Timer::print_total (const char *str, const int count, ACE_HANDLE ha ACE_OS::sprintf (buf, " total %3lu.%06lu secs\n", total_secs, (extra_nsecs + 500) / 1000); - ACE_OS::write (handle, str, strlen (str)); - ACE_OS::write (handle, buf, strlen (buf)); + ACE_OS::write (handle, str, ACE_OS::strlen (str)); + ACE_OS::write (handle, buf, ACE_OS::strlen (buf)); } int @@ -1085,22 +1085,18 @@ ACE_OS::strcasecmp (const char *s, const char *t) // equal. int result = 0; - if (strlen(s) != strlen(t)) - { - result = 1; - } + if (ACE_OS::strlen (s) != ACE_OS::strlen (t)) + result = 1; else { - while (*s != '\0' && *t != '\0') - { - if (tolower (*s) != tolower (*t)) - { - result = ((tolower (*s) < tolower (*t)) ? -1 : 1); - break; - } - - ++s; ++t; - } + for (; + *s != '\0' && *t != '\0'; + ++s; ++t) + if (tolower (*s) != tolower (*t)) + { + result = ((tolower (*s) < tolower (*t)) ? -1 : 1); + break; + } } return result; // == 0 for match, else 1 diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp index 4509ffcf7a0..5c5682e6b2e 100644 --- a/ace/Remote_Name_Space.cpp +++ b/ace/Remote_Name_Space.cpp @@ -44,7 +44,8 @@ ACE_Remote_Name_Space::bind (const ACE_WString &name, name.length () * sizeof (ACE_USHORT16), value.rep (), value.length () * sizeof (ACE_USHORT16), - type, strlen (type)); + type, + ACE_OS::strlen (type)); int result = this->ns_proxy_.request_reply (request); return result == ACE_Name_Reply::SUCCESS ? 0 : result; } @@ -59,7 +60,8 @@ ACE_Remote_Name_Space::rebind (const ACE_WString &name, name.length () * sizeof (ACE_USHORT16), value.rep (), value.length () * sizeof (ACE_USHORT16), - type, strlen (type)); + type, + ACE_OS::strlen (type)); int result = this->ns_proxy_.request_reply (request); return result == ACE_Name_Reply::SUCCESS ? 0 : result; } |