diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2012-04-17 19:13:37 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2012-04-17 19:13:37 +0000 |
| commit | 328f16c7d95f810838f8ca8e6fd4514707c6e408 (patch) | |
| tree | f6c9bd8276a33efe0f5dd3452ed2570de3607a14 | |
| parent | e932c221cad96ef0911cd0b9508fbceb972ebfc2 (diff) | |
| download | ATCD-328f16c7d95f810838f8ca8e6fd4514707c6e408.tar.gz | |
ChangeLogTag:Tue
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/String_Base.h | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e5e0aecb26a..5ab227a78a9 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 17 19:09:30 UTC 2012 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/String_Base.h: Made the single parameter constructors + explicit to avoid problems with implict conversions. Thanks to + Adam Rymarczuk <adam dot rymarczuk at suntradingllc dot com> for + reporting this. + Thu Apr 12 11:25:25 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_linux_icc.GNU: diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 4baf8e4213f..d3bbf80212f 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -103,9 +103,9 @@ public: * freeing memory. * @return ACE_String_Base containing const ACE_CHAR_T *s */ - ACE_String_Base (const ACE_CHAR_T *s, - ACE_Allocator *the_allocator = 0, - bool release = true); + explicit ACE_String_Base (const ACE_CHAR_T *s, + ACE_Allocator *the_allocator = 0, + bool release = true); /** * Constructor that copies @a len CHARs of @a s into dynamically @@ -144,7 +144,7 @@ public: * @param the_allocator ACE_Allocator associated with string * @return ACE_String_Base containing ACE_CHAR_T 'c' */ - ACE_String_Base (ACE_CHAR_T c, ACE_Allocator *the_allocator = 0); + explicit ACE_String_Base (ACE_CHAR_T c, ACE_Allocator *the_allocator = 0); /** * Constructor that allocates a len long string. @@ -159,9 +159,9 @@ public: * @param the_allocator ACE_Allocator associated with string * @return Empty ACE_String_Base with room for len CHARs */ - ACE_String_Base (size_type len, - ACE_CHAR_T c = 0, - ACE_Allocator *the_allocator = 0); + explicit ACE_String_Base (size_type len, + ACE_CHAR_T c = 0, + ACE_Allocator *the_allocator = 0); /** * Deletes the memory... |