diff options
Diffstat (limited to 'ACE/ace/String_Base.cpp')
| -rw-r--r-- | ACE/ace/String_Base.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp index c98e0b760ab..976e215d9df 100644 --- a/ACE/ace/String_Base.cpp +++ b/ACE/ace/String_Base.cpp @@ -67,13 +67,13 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (ACE_CHAR_T c, template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>::ACE_String_Base ( const ACE_CHAR_T *s, - typename ACE_String_Base<ACE_CHAR_T>::size_type len, + typename ACE_String_Base<ACE_CHAR_T>::size_type len, ACE_Allocator *the_allocator, bool release) : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()), len_ (0), buf_len_ (0), - rep_ (0), + rep_ (nullptr), release_ (false) { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base"); @@ -88,7 +88,7 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (const ACE_String_Base<ACE_CHAR_T> : allocator_ (s.allocator_ ? s.allocator_ : ACE_Allocator::instance ()), len_ (0), buf_len_ (0), - rep_ (0), + rep_ (nullptr), release_ (false) { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base"); @@ -104,7 +104,7 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base ( : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()), len_ (0), buf_len_ (0), - rep_ (0), + rep_ (nullptr), release_ (false) { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base"); @@ -128,10 +128,10 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s, bool release) { // Case 1. Going from memory to more memory - size_type new_buf_len = len + 1; + size_type const new_buf_len = len + 1; if (s != 0 && len != 0 && release && this->buf_len_ < new_buf_len) { - ACE_CHAR_T *temp = 0; + ACE_CHAR_T *temp = nullptr; ACE_ALLOCATOR (temp, (ACE_CHAR_T *) this->allocator_->malloc (new_buf_len * sizeof (ACE_CHAR_T))); |