From a1acdac588694d71c8cfab99146b3c0e95752da7 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Wed, 25 Jan 2017 22:07:48 -1000
Subject: [PATCH] Proper pure-virtual convention

---
 include/athena/DNA.hpp     |  2 +-
 include/athena/DNAYaml.hpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/athena/DNA.hpp b/include/athena/DNA.hpp
index 3b8a033..fc1688e 100644
--- a/include/athena/DNA.hpp
+++ b/include/athena/DNA.hpp
@@ -44,7 +44,7 @@ struct WStringAsString;
 template <Endian DNAE>
 struct DNA
 {
-    virtual ~DNA() {}
+    virtual ~DNA() = default;
 
     /**
      * @brief Common virtual read function for all DNA types
diff --git a/include/athena/DNAYaml.hpp b/include/athena/DNAYaml.hpp
index 0b295aa..18e0963 100644
--- a/include/athena/DNAYaml.hpp
+++ b/include/athena/DNAYaml.hpp
@@ -1203,14 +1203,14 @@ struct WStringAsStringYaml;
 template <Endian DNAE>
 struct DNAYaml : DNA<DNAE>
 {
-    virtual ~DNAYaml() {}
+    virtual ~DNAYaml() = default;
 
-    using DNA<DNAE>::read;
-    using DNA<DNAE>::write;
+    virtual void read(IStreamReader& r)=0;
+    virtual void write(IStreamWriter& w) const=0;
     virtual void read(YAMLDocReader& in)=0;
     virtual void write(YAMLDocWriter& out) const=0;
-    static const char* DNAType() {return nullptr;}
-    virtual const char* DNATypeV() const {return nullptr;}
+    static const char* DNAType() { return nullptr; }
+    virtual const char* DNATypeV() const { return nullptr; }
 
     template <size_t sizeVar>
     using Buffer = struct athena::io::BufferYaml<sizeVar, DNAE>;