diff options
author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-04-18 08:55:12 +0000 |
---|---|---|
committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-04-18 08:55:12 +0000 |
commit | 55c3ee197c4887e741d39505d31272cdcd904fe4 (patch) | |
tree | ab4fd7fa43cde27912004631bf61de2d65dcc09c /ACE/ace/String_Base.h | |
parent | 608c1d2cae11d5e8ac0b7ddf37bcd3c59d3cc903 (diff) | |
download | ATCD-55c3ee197c4887e741d39505d31272cdcd904fe4.tar.gz |
Wed Apr 18 08:51:31 UTC 2012 Martin Corino <mcorino@remedy.nl>
* ace/String_Base.h:
Reverted 'explicit' declaration for single arg constructor for
const ACE_TCHAR* as implicit conversion of this arg type to
ACE string class is the expected behaviour (similar to the
STL std::string).
* ace/Get_Opt.cpp:
Introduced explicit ACE_CString constructor call for single
arg ACE_TCHAR (not pointer) constructor.
Diffstat (limited to 'ACE/ace/String_Base.h')
-rw-r--r-- | ACE/ace/String_Base.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index d3bbf80212f..c0b02f76f74 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 */ - explicit ACE_String_Base (const ACE_CHAR_T *s, - ACE_Allocator *the_allocator = 0, - bool release = true); + 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 |