From f3976e3c06ef57671e823953a8cc27c30547da6d Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Fri, 6 Jul 2018 18:46:59 -0400
Subject: ...

---
 include/salticidae/netaddr.h |  6 +++++-
 include/salticidae/stream.h  | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/salticidae/netaddr.h b/include/salticidae/netaddr.h
index 1b53dff..eabb5da 100644
--- a/include/salticidae/netaddr.h
+++ b/include/salticidae/netaddr.h
@@ -84,7 +84,11 @@ struct NetAddr {
     bool operator==(const NetAddr &other) const {
         return ip == other.ip && port == other.port;
     }
-    
+
+    bool operator!=(const NetAddr &other) const {
+        return ip != other.ip || port != other.port;
+    }
+   
     operator std::string() const {
         struct in_addr in;
         in.s_addr = ip;
diff --git a/include/salticidae/stream.h b/include/salticidae/stream.h
index a5bc74c..fdbf967 100644
--- a/include/salticidae/stream.h
+++ b/include/salticidae/stream.h
@@ -170,7 +170,7 @@ class DataStream {
         return bytearray_t(buffer.begin() + offset, buffer.end());
     }
 
-    operator bytearray_t () const && {
+    operator bytearray_t () && {
         return std::move(buffer);
     }
 
@@ -223,7 +223,7 @@ class Blob {
     }
 
     bool operator!=(const Blob<N> &other) const {
-        return !(data == other);
+        return !(*this == other);
     }
 
     size_t cheap_hash() const { return *data; }
@@ -250,6 +250,12 @@ class Blob {
         }
         loaded = true;
     }
+
+    operator bytearray_t () const & {
+        DataStream s;
+        s << *this;
+        return std::move(s);
+    }
 };
 
 const size_t ENT_HASH_LENGTH = 256 / 8;
-- 
cgit v1.2.3-70-g09d2