Author: mordante
Date: Thu Apr 2 20:22:47 2009
New Revision: 34399
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34399&view=rev
Log:
Converted the old style casts to c++ style casts.
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=34399&r1=34398&r2=34399&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Thu Apr 2 20:22:47 2009
@@ -141,7 +141,7 @@
// execute the script, we run is a separate thread and
share the
// output which will make the logging look ugly.
- execlp(script.c_str(), script.c_str(), addon.c_str(),
(char *)NULL);
+ execlp(script.c_str(), script.c_str(), addon.c_str(),
static_cast<char *>(NULL));
// exec() and family never return; if they do, we have
a problem
std::cerr << "ERROR: exec failed with errno " << errno
<< " for addon " << addon
@@ -665,7 +665,7 @@
network::send_data(construct_error("No add-on with that name exists."), sock,
gzipped);
} else
if((*campaign)["passphrase"] != (*cpass)["passphrase"]) {
network::send_data(construct_error("Your old passphrase was incorrect."), sock,
gzipped);
- } else if((const
t_string)(*cpass)["new_passphrase"] == "") {
+ } else if(static_cast<const
t_string>((*cpass)["new_passphrase"]) == "") {
network::send_data(construct_error("No new passphrase was supplied."), sock,
gzipped);
} else {
(*campaign)["passphrase"] = (*cpass)["new_passphrase"];
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
