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

Further VS 64bit warning fixes.

Browse Source
This commit is contained in:
Jason Turner 2010-11-05 02:43:52 +00:00
parent 6a18862c79
commit 6e18aa3dcd
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/dispatchkit/dispatchkit.hpp
View File

@ -362,7 +362,7 @@ namespace chaiscript
validate_object_name(name);
StackData &stack = get_stack_data();
for (int i = stack.get<1>().size()-1; i >= 0; --i)
for (int i = static_cast<int>(stack.get<1>().size())-1; i >= 0; --i)
{
std::map<std::string, Boxed_Value>::const_iterator itr = (stack.get<1>())[i].find(name);
if (itr != (stack.get<1>())[i].end())
@ -479,7 +479,7 @@ namespace chaiscript
StackData &stack = get_stack_data();
// Is it in the stack?
for (int i = stack.get<1>().size()-1; i >= 0; --i)
for (int i = static_cast<int>(stack.get<1>().size())-1; i >= 0; --i)
{
std::map<std::string, Boxed_Value>::const_iterator stackitr = (stack.get<1>())[i].find(name);
if (stackitr != (stack.get<1>())[i].end())

8
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@ -153,8 +153,8 @@ namespace chaiscript
{
return false;
} else {
const int size = bvs.size();
for (int i = 0; i < size; ++i)
size_t size = bvs.size();
for (size_t i = 0; i < size; ++i)
{
if (!(tis[i+1].bare_equal(bvs[i].get_type_info()) && tis[i+1].is_const() >= bvs[i].get_type_info().is_const() ))
{
@ -240,7 +240,7 @@ namespace chaiscript
}
} else {
throw arity_error(params.size(), m_arity);
throw arity_error(static_cast<int>(params.size()), m_arity);
}
}
@ -508,7 +508,7 @@ namespace chaiscript
return Handle_Return<typename boost::add_reference<T>::type>::handle(o->*m_attr);
}
} else {
throw arity_error(params.size(), 1);
throw arity_error(static_cast<int>(params.size()), 1);
}
}

6
include/chaiscript/language/chaiscript_eval.hpp
View File

@ -286,7 +286,7 @@ namespace chaiscript
}
if (this->children.size() > 1) {
for (int i = this->children.size()-3; i >= 0; i -= 2) {
for (int i = static_cast<int>(this->children.size())-3; i >= 0; i -= 2) {
if (this->children[i+1]->text == "=") {
try {
Boxed_Value lhs = this->children[i]->eval(ss);
@ -551,7 +551,7 @@ namespace chaiscript
return Boxed_Value(Proxy_Function(new Dynamic_Proxy_Function
(boost::bind(&eval_function<Dispatch_Engine>, boost::ref(ss), this->children.back(), param_names, _1),
numparams)));
static_cast<int>(numparams))));
}
};
@ -562,7 +562,7 @@ namespace chaiscript
AST_Node(ast_node_text, id, fname, start_line, start_col, end_line, end_col) { }
virtual ~Block_AST_Node() {}
virtual Boxed_Value eval(Dispatch_Engine &ss){
unsigned int num_children = this->children.size();
size_t num_children = this->children.size();
ss.new_scope();
for (size_t i = 0; i < num_children; ++i) {

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

@ -383,7 +383,7 @@ namespace chaiscript
if (Binary_()) {
std::string match(start, input_pos);
int temp_int = 0;
unsigned int pos = 0, end = match.length();
size_t pos = 0, end = match.length();
while ((pos < end) && (pos < (2 + sizeof(int) * 8))) {
temp_int <<= 1;