OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

no need for a typedef

master
Daniel Kolesa 2016-03-24 21:52:16 +00:00
parent 60a04937c6
commit 54789177e2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ostd/string.hh
View File

@ -871,8 +871,7 @@ String to_string(std::initializer_list<T> init) {
template<typename R> template<typename R>
struct TempCString { struct TempCString {
private: private:
using Value = RemoveCv<RangeValue<R>>; RemoveCv<RangeValue<R>> *p_buf;
Value *p_buf;
bool p_allocated; bool p_allocated;
public: public:
@ -882,11 +881,11 @@ public:
s.p_buf = nullptr; s.p_buf = nullptr;
s.p_allocated = false; s.p_allocated = false;
} }
TempCString(R input, Value *sbuf, Size bufsize) TempCString(R input, RemoveCv<RangeValue<R>> *sbuf, Size bufsize)
: p_buf(nullptr), p_allocated(false) { : p_buf(nullptr), p_allocated(false) {
if (input.empty()) return; if (input.empty()) return;
if (input.size() >= bufsize) { if (input.size() >= bufsize) {
p_buf = new Value[input.size() + 1]; p_buf = new RemoveCv<RangeValue<R>>[input.size() + 1];
p_allocated = true; p_allocated = true;
} else p_buf = sbuf; } else p_buf = sbuf;
p_buf[input.copy(p_buf)] = '\0'; p_buf[input.copy(p_buf)] = '\0';
@ -901,8 +900,8 @@ public:
return *this; return *this;
} }
operator const Value *() const { return p_buf; } operator const RemoveCv<RangeValue<R>> *() const { return p_buf; }
const Value *get() const { return p_buf; } const RemoveCv<RangeValue<R>> *get() const { return p_buf; }
void swap(TempCString &s) { void swap(TempCString &s) {
detail::swap_adl(p_buf, s.p_buf); detail::swap_adl(p_buf, s.p_buf);