Change from using std::strtol to atol, to avoid issues with GCC versioning

markwj · markwj · commit d771980e52aa · 2020-09-02T11:18:12.000+08:00
diff --git a/jsl-parser.cpp b/jsl-parser.cpp
@@ -24,6 +24,7 @@
 
 
 #include <iostream>
+#include <stdlib.h>     /* atol */
 
 #define LOG_LOCAL_LEVEL ESP_LOG_NONE
 // #define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
@@ -540,7 +541,8 @@ bool jsl_parser::unescape(std::string& _str)
 
 		char buf[5] = {};
 		m_src.get(buf,4);
-		std::string::value_type ch = std::strtol(buf,nullptr,16);
+
+		std::string::value_type ch = atol(buf); //std::strtol(buf,nullptr,16);
 		utf8_str(ch,_str);
 		break;
 	}
@@ -602,4 +604,3 @@ bool jsl_parser::eat_space()
 	}
 	return false; // not EOF
 }
-

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`
`26`	`26`	`#include <iostream>`
	`27`	`+#include <stdlib.h> /* atol */`
`27`	`28`
`28`	`29`	`#define LOG_LOCAL_LEVEL ESP_LOG_NONE`
`29`	`30`	`// #define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE`
`@@ -540,7 +541,8 @@ bool jsl_parser::unescape(std::string& _str)`
`540`	`541`
`541`	`542`	`char buf[5] = {};`
`542`	`543`	`m_src.get(buf,4);`
`543`		`- std::string::value_type ch = std::strtol(buf,nullptr,16);`
	`544`	`+`
	`545`	`+ std::string::value_type ch = atol(buf); //std::strtol(buf,nullptr,16);`
`544`	`546`	`utf8_str(ch,_str);`
`545`	`547`	`break;`
`546`	`548`	`}`
`@@ -602,4 +604,3 @@ bool jsl_parser::eat_space()`
`602`	`604`	`}`
`603`	`605`	`return false; // not EOF`
`604`	`606`	`}`
`605`		`-`