From f0ec022bd08e02ff176a9f029eb3551915b30b55 Mon Sep 17 00:00:00 2001
From: Dimitar Trendafilov <trendafilov.dn@gmail.com>
Date: Sun, 4 Oct 2020 08:40:20 +0300
Subject: Fix build with GCC 8.3.0

- CheckOpCode takes an int, otherwise it will always return true
---
 JSImpl/src/ByteCodeGenerator.cpp | 4 ++--
 JSImpl/src/JSONParser.cpp        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'JSImpl/src')

diff --git a/JSImpl/src/ByteCodeGenerator.cpp b/JSImpl/src/ByteCodeGenerator.cpp
index fd85326..39f3bff 100644
--- a/JSImpl/src/ByteCodeGenerator.cpp
+++ b/JSImpl/src/ByteCodeGenerator.cpp
@@ -97,7 +97,7 @@ private:
 
 	void PushConst(double c);
 	IPLString CreateRegister();
-	bool CheckOpCode(Instruction::Type opcode) { return opcode >= Instruction::Type::FIRST && opcode <= Instruction::Type::LAST; }
+	bool CheckOpCode(int opcode) { return opcode >= Instruction::Type::FIRST && opcode <= Instruction::Type::LAST; }
 private:
 	IPLVector<IPLString> m_RegisterTable;
 	IPLVector<Instruction> m_Code;
@@ -678,4 +678,4 @@ IPLString GenerateByteCode(ExpressionPtr program, const IPLString& source, const
 	program->Accept(generator);
 
 	return generator.GetCode();
-}
\ No newline at end of file
+}
diff --git a/JSImpl/src/JSONParser.cpp b/JSImpl/src/JSONParser.cpp
index 13ad9d6..275fb0e 100644
--- a/JSImpl/src/JSONParser.cpp
+++ b/JSImpl/src/JSONParser.cpp
@@ -3,6 +3,7 @@
 
 #include <unordered_map>
 #include <cstdlib>
+#include <cstring>
 
 void SkipWhitespaces(const char*& json)
 {
@@ -71,7 +72,7 @@ ExpressionPtr JSONParseWrap(const char*& json, const char* eName)
 template <>																						\
 ExpressionPtr JSONParseWrap<ClassName##Type>(const char*& json, const char* eName)				\
 {																								\
-	auto ptr = IPLMakeSharePtr<::##ClassName>();												\
+	auto ptr = IPLMakeSharePtr<::ClassName>();													\
 	int membersCount = 0, currentVisitCount = 0;												\
 	(void)currentVisitCount;																	\
 	json += strlen("{");																		\
-- 
cgit v1.3.1-23-gd82d