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

Fix errors and warnings found on VisualStudio 2005

Browse Source
This commit is contained in:
Jason Turner
2012-11-16 12:27:41 -07:00
parent 4c65e45598
commit afd27a4b01
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -538,13 +538,23 @@ namespace chaiscript
BOOST_ASSERT(sizeof(long) == sizeof(boost::uint64_t) || sizeof(long) * 2 == sizeof(boost::uint64_t)); BOOST_ASSERT(sizeof(long) == sizeof(boost::uint64_t) || sizeof(long) * 2 == sizeof(boost::uint64_t));
if ((sizeof(long) < sizeof(boost::uint64_t)) #ifdef BOOST_MSVC
&& (u >> ((sizeof(uint64_t) - sizeof(long)) * 8)) > 0) //Thank you MSVC, yes we know that a constant value is being used in the if
// statment in this compiler / architecture
#pragma warning(push)
#pragma warning(disable : 4127)
#endif
if ( sizeof(long) < sizeof(boost::uint64_t) && (u >> ((sizeof(boost::uint64_t) - sizeof(long)) * 8)) > 0)
{ {
//requires something bigger than long //requires something bigger than long
longlong_ = true; longlong_ = true;
} }
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
if (longlong_) if (longlong_)
{ {
size = sizeof(boost::int64_t) * 8; size = sizeof(boost::int64_t) * 8;
@@ -631,7 +641,7 @@ namespace chaiscript
} }
if (Binary_()) { if (Binary_()) {
std::string match(start, m_input_pos); std::string match(start, m_input_pos);
int64_t temp_int = 0; boost::int64_t temp_int = 0;
size_t pos = 0, end = match.length(); size_t pos = 0, end = match.length();
while ((pos < end) && (pos < (2 + sizeof(int) * 8))) { while ((pos < end) && (pos < (2 + sizeof(int) * 8))) {

3
unittests/multithreaded_test.cpp
View File

@@ -7,6 +7,7 @@
#include <iostream> #include <iostream>
#include <list> #include <list>
#include <algorithm>
#include <chaiscript/chaiscript.hpp> #include <chaiscript/chaiscript.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
@@ -67,7 +68,7 @@ int main()
std::vector<boost::shared_ptr<boost::thread> > threads; std::vector<boost::shared_ptr<boost::thread> > threads;
// Ensure at least two, but say only 7 on an 8 core processor // Ensure at least two, but say only 7 on an 8 core processor
int num_threads = std::max(boost::thread::hardware_concurrency() - 1, 2u); int num_threads = std::max<unsigned int>(boost::thread::hardware_concurrency() - 1, 2u);
for (int i = 0; i < num_threads; ++i) for (int i = 0; i < num_threads; ++i)
{ {