From f0e31487f07ae38f48b6f84ea597dc6b79732096 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Wed, 19 Aug 2015 20:37:27 -0700
Subject: [PATCH] raw_istream and kin: a few cleanups.

anchor() doesn't seem to change compiler output in current compilers, so
remove it.  Use default where appropriate rather than empty bodies.
---
 src/raw_istream.cpp        | 2 --
 src/raw_istream.h          | 8 +++-----
 src/raw_socket_istream.cpp | 2 --
 src/raw_socket_istream.h   | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/raw_istream.cpp b/src/raw_istream.cpp
index c43ef0fb07..f300b9e418 100644
--- a/src/raw_istream.cpp
+++ b/src/raw_istream.cpp
@@ -11,8 +11,6 @@
 
 using namespace nt;
 
-void raw_istream::anchor() {}
-
 bool raw_mem_istream::read(void* data, std::size_t len) {
   if (len > m_left) return false;
   std::memcpy(data, m_cur, len);
diff --git a/src/raw_istream.h b/src/raw_istream.h
index 3871d66693..f8adc23403 100644
--- a/src/raw_istream.h
+++ b/src/raw_istream.h
@@ -13,11 +13,9 @@
 namespace nt {
 
 class raw_istream {
-  void anchor();
-
  public:
-  raw_istream() {}
-  virtual ~raw_istream() {}
+  raw_istream() = default;
+  virtual ~raw_istream() = default;
   virtual bool read(void* data, std::size_t len) = 0;
   virtual void close() = 0;
 
@@ -28,7 +26,7 @@ class raw_istream {
 class raw_mem_istream : public raw_istream {
  public:
   raw_mem_istream(const char* mem, std::size_t len) : m_cur(mem), m_left(len) {}
-  virtual ~raw_mem_istream() {}
+  virtual ~raw_mem_istream() = default;
   virtual bool read(void* data, std::size_t len);
   virtual void close() {}
 
diff --git a/src/raw_socket_istream.cpp b/src/raw_socket_istream.cpp
index e69ef983b7..a8e71c5f9c 100644
--- a/src/raw_socket_istream.cpp
+++ b/src/raw_socket_istream.cpp
@@ -9,8 +9,6 @@
 
 using namespace nt;
 
-raw_socket_istream::~raw_socket_istream() {}
-
 bool raw_socket_istream::read(void* data, std::size_t len) {
   char* cdata = static_cast<char*>(data);
   std::size_t pos = 0;
diff --git a/src/raw_socket_istream.h b/src/raw_socket_istream.h
index ab2d2c5259..91bcc1fae2 100644
--- a/src/raw_socket_istream.h
+++ b/src/raw_socket_istream.h
@@ -18,7 +18,7 @@ class raw_socket_istream : public raw_istream {
  public:
   raw_socket_istream(NetworkStream& stream, int timeout = 0)
       : m_stream(stream), m_timeout(timeout) {}
-  virtual ~raw_socket_istream();
+  virtual ~raw_socket_istream() = default;
   virtual bool read(void* data, std::size_t len);
   virtual void close();