proper swap and move operations on swap oss
This commit is contained in:
		@@ -22,7 +22,6 @@ public:
 | 
			
		||||
 | 
			
		||||
    stack_devicebuf() = default;
 | 
			
		||||
    ~stack_devicebuf() = default;
 | 
			
		||||
    stack_devicebuf& operator=(const stack_devicebuf&) = delete;
 | 
			
		||||
 | 
			
		||||
    stack_devicebuf(const stack_devicebuf& other) :std::basic_streambuf<char>(), _stackbuf(other._stackbuf)
 | 
			
		||||
    {}
 | 
			
		||||
@@ -34,6 +33,12 @@ public:
 | 
			
		||||
        other.clear();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    stack_devicebuf& operator=(stack_devicebuf&& other)
 | 
			
		||||
    {
 | 
			
		||||
        std::swap(_stackbuf, other._stackbuf);
 | 
			
		||||
        return *this;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const stackbuf_t& buf() const
 | 
			
		||||
    {
 | 
			
		||||
        return _stackbuf;
 | 
			
		||||
@@ -76,8 +81,7 @@ public:
 | 
			
		||||
    fast_oss() :std::ostream(&_dev) {}
 | 
			
		||||
    ~fast_oss() = default;
 | 
			
		||||
 | 
			
		||||
    fast_oss& operator=(const fast_oss& other) = delete;
 | 
			
		||||
    fast_oss& operator=(const fast_oss&& other) = delete;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    fast_oss(const fast_oss& other) :std::basic_ios<char>(), std::ostream(&_dev), _dev(other._dev)
 | 
			
		||||
    {}
 | 
			
		||||
@@ -87,6 +91,21 @@ public:
 | 
			
		||||
        other.clear();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    fast_oss& operator=(fast_oss&& other)
 | 
			
		||||
    {
 | 
			
		||||
        swap(*this, other);
 | 
			
		||||
        return *this;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void swap(fast_oss& first, fast_oss& second) // nothrow
 | 
			
		||||
    {
 | 
			
		||||
        using std::swap;
 | 
			
		||||
        swap(first._dev, second._dev);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    std::string str()
 | 
			
		||||
    {
 | 
			
		||||
        auto buffer = _dev.buf();
 | 
			
		||||
@@ -136,8 +155,8 @@ public:
 | 
			
		||||
        auto buffer = oss.buf();
 | 
			
		||||
        _dev.sputn(buffer.data(), buffer.size());
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
    stack_devicebuf _dev;
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -38,8 +38,8 @@ struct log_msg
 | 
			
		||||
        swap(l.level, r.level);
 | 
			
		||||
        swap(l.time, r.time);
 | 
			
		||||
        swap(l.tm_time, r.tm_time);
 | 
			
		||||
        //swap(l.raw, r.raw);
 | 
			
		||||
        //swap(l.formatted, r.formatted);
 | 
			
		||||
        swap(l.raw, r.raw);
 | 
			
		||||
        swap(l.formatted, r.formatted);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -19,9 +19,6 @@ public:
 | 
			
		||||
    static const unsigned short stack_size = STACK_SIZE;
 | 
			
		||||
    stack_buf() :_v(), _stack_size(0) {}
 | 
			
		||||
    ~stack_buf() = default;
 | 
			
		||||
 | 
			
		||||
    stack_buf& operator=(const stack_buf& other) = delete;
 | 
			
		||||
 | 
			
		||||
    stack_buf(const stack_buf& other):stack_buf(other, delegate_copy_move {})
 | 
			
		||||
    {}
 | 
			
		||||
 | 
			
		||||
@@ -29,6 +26,16 @@ public:
 | 
			
		||||
    {
 | 
			
		||||
        other.clear();
 | 
			
		||||
    }
 | 
			
		||||
    template<class T1>
 | 
			
		||||
    stack_buf& operator=(T1&& other)
 | 
			
		||||
    {
 | 
			
		||||
        _stack_size = other._stack_size;
 | 
			
		||||
        if (other.vector_used())
 | 
			
		||||
            _v = std::forward<T1>(other)._v;
 | 
			
		||||
        else
 | 
			
		||||
            std::copy_n(other._stack_array.begin(), other._stack_size, _stack_array.begin());
 | 
			
		||||
        return *this;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void append(const char* buf, std::size_t buf_size)
 | 
			
		||||
    {
 | 
			
		||||
@@ -62,14 +69,6 @@ public:
 | 
			
		||||
        _v.clear();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* bufpair_t get() const
 | 
			
		||||
     {
 | 
			
		||||
         if (vector_used())
 | 
			
		||||
             return bufpair_t(_v.data(), _v.size());
 | 
			
		||||
         else
 | 
			
		||||
             return bufpair_t(_stack_array.data(), _stack_size);
 | 
			
		||||
     }*/
 | 
			
		||||
 | 
			
		||||
    const char* data() const
 | 
			
		||||
    {
 | 
			
		||||
        if (vector_used())
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user