Unified Diff: compiled/String.h
Issue 29587914:
Issue 5142 - Convert Element Hiding to C++ (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Added OwnedStringMap to address ownership of keys
Created Nov. 25, 2017, 3:22 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« compiled/Map.h ('k')
|
compiled/StringMap.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: compiled/String.h |
| =================================================================== |
| --- a/compiled/String.h |
| +++ b/compiled/String.h |
| @@ -276,17 +276,17 @@ |
| OwnedString newValue(length() + additionalSize); |
| if (length() > 0) |
| std::memcpy(newValue.mBuf, mBuf, sizeof(value_type) * length()); |
| *this = std::move(newValue); |
| } |
| public: |
| explicit OwnedString(size_type len = 0) |
| - : String(nullptr, len, READ_WRITE) |
| + : String(nullptr, len, len ? READ_WRITE : INVALID) |
| { |
| if (len) |
| { |
| mBuf = new value_type[length()]; |
| annotate_address(mBuf, "String"); |
| } |
| else |
| mBuf = nullptr; |
| @@ -319,16 +319,21 @@ |
| } |
| ~OwnedString() |
| { |
| if (mBuf) |
| delete[] mBuf; |
| } |
| + void reset(const String& str) |
| + { |
| + *this = str; |
| + } |
| + |
| OwnedString& operator=(const String& str) |
| { |
| *this = OwnedString(str); |
| return *this; |
| } |
| OwnedString& operator=(const OwnedString& str) |
| { |
« no previous file with comments
|
« compiled/Map.h ('k')
|
compiled/StringMap.h » ('j')
|
no next file with comments »
