generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ChaiScript_5_0_CPP_11

Browse Source 
Conflicts:
	include/chaiscript/dispatchkit/bootstrap_stl.hpp
	include/chaiscript/language/chaiscript_parser.hpp
	unittests/multithreaded_test.cpp
This commit is contained in:
Jason Turner
2012-11-16 16:32:39 -07:00
parent 6bb90f9d6d 58f3256389
commit 85ba42849b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/chaiscript/language/chaiscript_parser.hpp
View File

@@ -545,6 +545,7 @@ namespace chaiscript
longlong_ = true;
}
if (longlong_)
{
size = sizeof(int64_t) * 8;
@@ -559,7 +560,7 @@ namespace chaiscript
if (unsignedrequired && !unsigned_)
{
if (t_type == std::hex || t_type == std::oct)
if (t_type == &std::hex || t_type == &std::oct)
{
// with hex and octal we are happy to just make it unsigned
unsigned_ = true;

1
unittests/multithreaded_test.cpp
View File

@@ -7,6 +7,7 @@
#include <iostream>
#include <list>
#include <algorithm>
#include <chaiscript/chaiscript.hpp>