Merge pull request #345 from awleffew/compile_error
Fix incorrect stringstream syntax.
This commit is contained in:
commit
95e88fa294
4 changed files with 6 additions and 2 deletions
|
@ -436,6 +436,7 @@ Version 1.13.0-dev:
|
|||
* Multiplayer server can now handle scenarios with more than 9 sides
|
||||
* [modify_side] controller= now works in networked mp. If a null-controlled side becomes alive by
|
||||
[modify_side] controller=ai/human then the currently active client will be assiged controll
|
||||
* Fixed a stingstream syntax error that caused the build to fail in Visual Studio 13
|
||||
|
||||
Version 1.11.11:
|
||||
* Add-ons server:
|
||||
|
|
|
@ -904,6 +904,9 @@
|
|||
[entry]
|
||||
name = "Aaron Keisch-Walter (Exasperation)"
|
||||
[/entry]
|
||||
[entry]
|
||||
name = "Adam Leffew"
|
||||
[/entry]
|
||||
[entry]
|
||||
name = "Adrian Iosif (Zappaman)"
|
||||
[/entry]
|
||||
|
|
|
@ -20,7 +20,7 @@ configure_engine::configure_engine(saved_game& state) :
|
|||
if (sides_.first == sides_.second) {
|
||||
std::stringstream msg;
|
||||
msg << "Configure Engine: No sides found in scenario, aborting.";
|
||||
std::cerr << msg;
|
||||
std::cerr << msg.str();
|
||||
std::cerr << "Full scenario config:\n";
|
||||
std::cerr << state_.to_config().debug();
|
||||
throw game::error(msg.str());
|
||||
|
|
|
@ -82,7 +82,7 @@ static int intf_describe_plugins(lua_State * L)
|
|||
<< plugins_manager::get()->get_name(i)
|
||||
<< "\n";
|
||||
|
||||
DBG_LUA << line;
|
||||
DBG_LUA << line.str();
|
||||
|
||||
lua_pushstring(L, line.str().c_str());
|
||||
lua_call(L, 1, 0);
|
||||
|
|
Loading…
Add table
Reference in a new issue