1 files changed, 6 insertions, 6 deletions
diff --git a/src/commodity.h b/src/commodity.h
index 42cc6d8f..d2d8af21 100644
--- a/src/commodity.h
+++ b/src/commodity.h
@@ -185,7 +185,7 @@ protected:
 	symbol(_symbol), precision(0), searched(false) {
       TRACE_CTOR(base_t, "const string&");
     }
-    ~base_t() {
+    virtual ~base_t() {
       TRACE_DTOR(base_t);
     }
 
@@ -251,7 +251,7 @@ public:
     return *this;
   }
 
-  bool is_annotated() const {
+  bool has_annotation() const {
     return annotated;
   }
 
@@ -386,6 +386,10 @@ public:
 
   bool valid() const;
 
+  struct compare_by_commodity {
+    bool operator()(const amount_t * left, const amount_t * right) const;
+  };
+
 #if defined(HAVE_BOOST_SERIALIZATION)
 private:
   supports_flags<uint_least16_t> temp_flags;
@@ -419,10 +423,6 @@ inline std::ostream& operator<<(std::ostream& out, const commodity_t& comm) {
   return out;
 }
 
-struct compare_amount_commodities {
-  bool operator()(const amount_t * left, const amount_t * right) const;
-};
-
 void to_xml(std::ostream& out, const commodity_t& comm,
 	    bool commodity_details = false);