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

Merge branch 'master' into 2011-09-09-CxScript

Browse Source 
Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp
	include/chaiscript/dispatchkit/dispatchkit.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	src/multithreaded.cpp
This commit is contained in:
Jason Turner
2012-06-03 09:27:05 -06:00
parent 4ebfe264e9 d2aba2ef56
commit 5a380abc68
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@@ -94,8 +94,8 @@ namespace chaiscript
/** /**
* to_string function for internal use. Uses ostream operator<< * to_string function for internal use. Uses ostream operator<<
*/ */
template<typename Input> template<typename Input>
std::string to_string(Input i) std::string to_string(Input i)
{ {
@@ -104,11 +104,10 @@ namespace chaiscript
return ss.str(); return ss.str();
} }
/** /**
* Internal function for converting from a string to a value * Internal function for converting from a string to a value
* uses ostream operator >> to perform the conversion * uses ostream operator >> to perform the conversion
*/ */
template<typename Input> template<typename Input>
Input parse_string(const std::string &i) Input parse_string(const std::string &i)
{ {
@@ -119,7 +118,6 @@ namespace chaiscript
} }
/** /**
* Add all common functions for a POD type. All operators, and * Add all common functions for a POD type. All operators, and
* common conversions * common conversions