Author: sapient
Date: Mon Jul 2 00:33:41 2007
New Revision: 18606
URL: http://svn.gna.org/viewcvs/wesnoth?rev=18606&view=rev
Log:
some implementations of std::make_pair cannot specify explicit initializer for
arrays such as const char (&)[16]. Solution: use std::string instead.
Modified:
trunk/src/campaign_server/campaign_server.cpp
Modified: trunk/src/campaign_server/campaign_server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=18606&r1=18605&r2=18606&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Mon Jul 2 00:33:41 2007
@@ -83,7 +83,7 @@
bool campaign_server::fire(const std::string& hook)
{
- out_.clear();
+ out_.resize(0);
const std::map<std::string, std::string>::const_iterator itor =
hooks_.find(hook);
if(itor == hooks_.end()) return true;
@@ -170,8 +170,8 @@
}
// load the hooks
- hooks_.insert(std::make_pair("hook_pre_upload",
cfg_["hook_pre_upload"]));
- hooks_.insert(std::make_pair("hook_post_upload",
cfg_["hook_post_upload"]));
+ hooks_.insert(std::make_pair(std::string("hook_pre_upload"),
cfg_["hook_pre_upload"]));
+ hooks_.insert(std::make_pair(std::string("hook_post_upload"),
cfg_["hook_post_upload"]));
}
void find_translations(const config& cfg, config& campaign)
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits