commit b4b9d8dc165a0344154467f7b6c58901c44b5c6e
author Wim Leflere <wim.leflere@gmail.com> Thu May 20 12:40:57 2021 +0200
committer GitHub <noreply@github.com> Thu May 20 12:40:57 2021 +0200
tree 20f9da79f9a4464c1ffe81fca9de8dbb9aec0e7c
parent b14f8a1e3a62fc11628f2821e99b46c33f4d2f10

Fix build warnings for Clang and MSVC (#197)

* remove unnecessary semicolons on function definitions

* add virtual destructor to base class

* fix possible loss of data warning for double to int conversion with explicit cast

* ignore Visual Studio build folder

Co-authored-by: Wim Leflere <wleflere@cochlear.com>

.gitignore

diff --git a/.gitignore b/.gitignore
index 060ca13..3fb2b98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@
 .coveralls.yml
 
 .vscode
+.vs
 
 doc/html
 doc/latex

include/inja/node.hpp

diff --git a/include/inja/node.hpp b/include/inja/node.hpp
index be0bf98..e85df57 100644
--- a/include/inja/node.hpp
+++ b/include/inja/node.hpp
@@ -33,6 +33,8 @@
 
 class NodeVisitor {
 public:
+  virtual ~NodeVisitor() = default;
+
   virtual void visit(const BlockNode& node) = 0;
   virtual void visit(const TextNode& node) = 0;
   virtual void visit(const ExpressionNode& node) = 0;
@@ -59,7 +61,7 @@
   size_t pos;
 
   AstNode(size_t pos) : pos(pos) { }
-  virtual ~AstNode() { };
+  virtual ~AstNode() { }
 };
 
 
@@ -326,7 +328,7 @@
 
   void accept(NodeVisitor& v) const {
     v.visit(*this);
-  };
+  }
 };
 
 class SetStatementNode : public StatementNode {
@@ -338,7 +340,7 @@
 
   void accept(NodeVisitor& v) const {
     v.visit(*this);
-  };
+  }
 };
 
 } // namespace inja

include/inja/renderer.hpp

diff --git a/include/inja/renderer.hpp b/include/inja/renderer.hpp
index ad04f27..baece36 100644
--- a/include/inja/renderer.hpp
+++ b/include/inja/renderer.hpp
@@ -304,7 +304,7 @@
     case Op::Power: {
       auto args = get_arguments<2>(node);
       if (args[0]->is_number_integer() && args[1]->get<int>() >= 0) {
-        int result = std::pow(args[0]->get<int>(), args[1]->get<int>());
+        int result = static_cast<int>(std::pow(args[0]->get<int>(), args[1]->get<int>()));
         result_ptr = std::make_shared<json>(std::move(result));
         json_tmp_stack.push_back(result_ptr);
       } else {

single_include/inja/inja.hpp

diff --git a/single_include/inja/inja.hpp b/single_include/inja/inja.hpp
index a69457b..c767ef7 100644
--- a/single_include/inja/inja.hpp
+++ b/single_include/inja/inja.hpp
@@ -2351,6 +2351,8 @@
 
 class NodeVisitor {
 public:
+  virtual ~NodeVisitor() = default;
+
   virtual void visit(const BlockNode& node) = 0;
   virtual void visit(const TextNode& node) = 0;
   virtual void visit(const ExpressionNode& node) = 0;
@@ -2377,7 +2379,7 @@
   size_t pos;
 
   AstNode(size_t pos) : pos(pos) { }
-  virtual ~AstNode() { };
+  virtual ~AstNode() { }
 };
 
 
@@ -2644,7 +2646,7 @@
 
   void accept(NodeVisitor& v) const {
     v.visit(*this);
-  };
+  }
 };
 
 class SetStatementNode : public StatementNode {
@@ -2656,7 +2658,7 @@
 
   void accept(NodeVisitor& v) const {
     v.visit(*this);
-  };
+  }
 };
 
 } // namespace inja
@@ -3672,7 +3674,7 @@
     case Op::Power: {
       auto args = get_arguments<2>(node);
       if (args[0]->is_number_integer() && args[1]->get<int>() >= 0) {
-        int result = std::pow(args[0]->get<int>(), args[1]->get<int>());
+        int result = static_cast<int>(std::pow(args[0]->get<int>(), args[1]->get<int>()));
         result_ptr = std::make_shared<json>(std::move(result));
         json_tmp_stack.push_back(result_ptr);
       } else {