diff options
| author | Steve Huston <shuston@riverace.com> | 2011-02-28 20:32:47 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2011-02-28 20:32:47 +0000 |
| commit | 56f4545427808202447582353b41f42fa7578b6e (patch) | |
| tree | f2e1b634f7a30ff810d113e67854dcb71654b662 | |
| parent | 7198d0cc2f4294476053a49a97d792ca5268b6f5 (diff) | |
| download | ATCD-56f4545427808202447582353b41f42fa7578b6e.tar.gz | |
ChangeLogTag:Mon Feb 28 20:29:59 UTC 2011 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp | 8 | ||||
| -rw-r--r-- | examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 944af71e7dd..0145bc5c4a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 28 20:29:59 UTC 2011 Steve Huston <shuston@riverace.com> + + * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp: + * examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp: Replaced the + name "mod_name" with "module_name" to avoid a clash with macro + defined in /usr/include/sys/stropts.h encountered when optimized + build was done. + Mon Feb 28 18:10:19 UTC 2011 Steve Huston <shuston@riverace.com> * include/makeinclude/platform_aix_ibm.GNU: Remove the -qfuncsect diff --git a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp index b89e70f35f0..0300f6d7133 100644 --- a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp +++ b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp @@ -71,12 +71,12 @@ Event_Analyzer::fini (void) int Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const { - const ACE_TCHAR *mod_name = this->name (); + const ACE_TCHAR *module_name = this->name (); - if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0) + if (*strp == 0 && (*strp = ACE_OS::strdup (module_name)) == 0) return -1; else - ACE_OS::strncpy (*strp, mod_name, length); + ACE_OS::strncpy (*strp, module_name, length); - return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (mod_name)); + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (module_name)); } diff --git a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp index bd84adc3052..3de85175592 100644 --- a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp +++ b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp @@ -62,14 +62,14 @@ Event_Analyzer::fini (void) int Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const { - const ACE_TCHAR *mod_name = this->name (); + const ACE_TCHAR *module_name = this->name (); - if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0) + if (*strp == 0 && (*strp = ACE_OS::strdup (module_name)) == 0) return -1; else - ACE_OS::strncpy (*strp, mod_name, length); + ACE_OS::strncpy (*strp, module_name, length); - return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (mod_name)); + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (module_name)); } #endif /* ACE_HAS_THREADS */ |