small addition to avoid compiler warnings using Clang. C+=14 now

proycon · Dec 8, 2024 · 08c92d4 · 08c92d4
1 parent 1d9056d
commit 08c92d4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/include/patternmodel.h b/include/patternmodel.h
@@ -1502,7 +1502,7 @@ class PatternModel: public MapType, public PatternModelInterface {
         /**
          * Write the pattern model to output stream
          */
-        void write( std::ostream& out) {
+        void write( std::ostream& out) override {
             const char null = 0;
             out.write( (char*) &null, sizeof(char));
             unsigned char t = this->getmodeltype();

diff --git a/include/patternstore.h b/include/patternstore.h
@@ -803,7 +803,7 @@ class HashOrderedPatternSet: public PatternStore<t_hashorderedpatternset,ReadWri
         HashOrderedPatternSet(): PatternStore<t_hashorderedpatternset,ReadWriteSizeType>() {};
         virtual ~HashOrderedPatternSet();
 
-        void insert(const Pattern& pattern) {
+        void insert(const Pattern& pattern) override {
             data.insert(pattern);
         }
 
@@ -878,7 +878,8 @@ class PatternMap: public PatternMapStore<std::unordered_map<Pattern,ValueType>,V
             data[pattern] = value;
         }
 
-        void insert(const Pattern & pattern) {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType, usually 0
+        void insert(const Pattern & pattern) override {
+	  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType, usually 0
 
         bool has(const Pattern & pattern) const override {
             return data.count(pattern);
@@ -929,7 +930,8 @@ class PatternPointerMap: public PatternMapStore<std::unordered_map<PatternPointe
             data[pattern] = value;
         }
 
-        void insert(const PatternPointer & pattern) {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType, usually 0
+  void insert(const PatternPointer & pattern) override
+  {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType, usually 0
 
         bool has(const Pattern & pattern) const override {
             return data.count(pattern);
@@ -978,11 +980,13 @@ class OrderedPatternPointerMap: public PatternMapStore<std::map<PatternPointer,V
   explicit OrderedPatternPointerMap():
     corpus( NULL){ }
 
-  void insert(const PatternPointer & pattern, const ValueType & value) {
+  void insert(const PatternPointer & pattern, const ValueType & value) override
+  {
     data[pattern] = value;
   }
 
-        void insert(const PatternPointer & pattern) {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType, usually 0
+  void insert(const PatternPointer & pattern) override
+  {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType, usually 0
 
         bool has(const Pattern & pattern) const override {
             return data.count(pattern);
@@ -1026,11 +1030,12 @@ class HashOrderedPatternMap: public PatternMapStore<std::map<const Pattern,Value
         HashOrderedPatternMap(): PatternMapStore<std::map<const Pattern, ValueType>,ValueType,ValueHandler,ReadWriteSizeType>() {};
         virtual ~HashOrderedPatternMap() {};
 
-        void insert(const Pattern & pattern, const ValueType & value) {
-            data[pattern] = value;
-        }
+  void insert(const Pattern & pattern, const ValueType & value) override {
+    data[pattern] = value;
+  }
 
-        void insert(const Pattern & pattern) {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType
+  void insert(const Pattern & pattern) override
+  {  data[pattern] = ValueType(); } //singular insert required by PatternStore, implies 'default' ValueType
 
         bool has(const Pattern & pattern) const override { return data.count(pattern); }
         bool has(const PatternPointer & pattern) const override { return data.count(pattern); }

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -Wall -O3 -std=c++17 -Wno-vla -fPIC
+AM_CXXFLAGS = -Wall -O3 -std=c++14 -Wno-vla -fPIC
 AM_CPPFLAGS = -I@top_srcdir@/include
 AM_LDFLAGS = -static -fPIC