Use ConstBufferRef and add some noexcept

1 files changed, 17 insertions, 17 deletions

diff --git a/vespalib/src/vespa/vespalib/util/buffer.h b/vespalib/src/vespa/vespalib/util/buffer.h
index e5a09dbf300..c8438a0c0c5 100644
--- a/vespalib/src/vespa/vespalib/util/buffer.h
+++ b/vespalib/src/vespa/vespalib/util/buffer.h
@@ -11,16 +11,16 @@ namespace vespalib {
 class BufferRef
 {
 public:
-    BufferRef() : _buf(nullptr), _sz(0) { }
-    BufferRef(void * buf, size_t sz) : _buf(buf), _sz(sz) { }
-    const char * c_str() const { return static_cast<const char *>(_buf); }
-    char * str()               { return static_cast<char *>(_buf); }
-    const void * data()  const { return _buf; }
-    void * data()              { return _buf; }
-    size_t size()        const { return _sz; }
-    void setSize(size_t sz)    { _sz = sz; }
-    char & operator [] (size_t i) { return str()[i]; }
-    const char & operator [] (size_t i) const { return c_str()[i]; }
+    BufferRef() noexcept : _buf(nullptr), _sz(0) { }
+    BufferRef(void * buf, size_t sz) noexcept : _buf(buf), _sz(sz) { }
+    const char * c_str() const noexcept { return static_cast<const char *>(_buf); }
+    char * str()               noexcept { return static_cast<char *>(_buf); }
+    const void * data()  const noexcept { return _buf; }
+    void * data()              noexcept { return _buf; }
+    size_t size()        const noexcept { return _sz; }
+    void setSize(size_t sz)    noexcept { _sz = sz; }
+    char & operator [] (size_t i) noexcept { return str()[i]; }
+    const char & operator [] (size_t i) const noexcept { return c_str()[i]; }
 private:
     void * _buf;
     size_t _sz;
@@ -32,13 +32,13 @@ private:
 class ConstBufferRef
 {
 public:
-    ConstBufferRef() : _buf(nullptr), _sz(0) { }
-    ConstBufferRef(const void * buf, size_t sz) : _buf(buf), _sz(sz) { }
-    ConstBufferRef(const BufferRef & rhs) : _buf(rhs.data()), _sz(rhs.size()) { }
-    const char * c_str() const { return static_cast<const char *>(_buf); }
-    const void * data()  const { return _buf; }
-    size_t size()        const { return _sz; }
-    const char & operator [] (size_t i) const { return c_str()[i]; }
+    ConstBufferRef() noexcept : _buf(nullptr), _sz(0) { }
+    ConstBufferRef(const void * buf, size_t sz) noexcept : _buf(buf), _sz(sz) { }
+    ConstBufferRef(const BufferRef & rhs) noexcept : _buf(rhs.data()), _sz(rhs.size()) { }
+    const char * c_str() const noexcept { return static_cast<const char *>(_buf); }
+    const void * data()  const noexcept { return _buf; }
+    size_t size()        const noexcept { return _sz; }
+    const char & operator [] (size_t i) const noexcept { return c_str()[i]; }
 private:
     const void * _buf;
     size_t _sz;