[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src network.cpp network.hpp server/serv...
From: |
Guillaume Melquiond |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src network.cpp network.hpp server/serv... |
Date: |
Thu, 09 Dec 2004 15:03:24 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 04/12/09 19:52:47
Modified files:
src : network.cpp network.hpp
src/server : server.cpp
Log message:
NULL is not an integer, and trivial integer constants should be visible
for compiler optimization.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.hpp.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/server.cpp.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
Patches:
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.47 wesnoth/src/network.cpp:1.48
--- wesnoth/src/network.cpp:1.47 Thu Nov 18 04:08:32 2004
+++ wesnoth/src/network.cpp Thu Dec 9 19:52:46 2004
@@ -142,8 +142,6 @@
return
connection_stats(details.sent,details.received,details.connected_at);
}
-const connection null_connection = 0;
-
error::error(const std::string& msg, connection sock) : message(msg),
socket(sock)
{
if(socket) {
Index: wesnoth/src/network.hpp
diff -u wesnoth/src/network.hpp:1.20 wesnoth/src/network.hpp:1.21
--- wesnoth/src/network.hpp:1.20 Mon Oct 11 23:46:40 2004
+++ wesnoth/src/network.hpp Thu Dec 9 19:52:46 2004
@@ -46,7 +46,7 @@
typedef int connection;
-extern const connection null_connection;
+connection const null_connection = 0;
//the number of peers we are connected to
size_t nconnections();
Index: wesnoth/src/server/server.cpp
diff -u wesnoth/src/server/server.cpp:1.61 wesnoth/src/server/server.cpp:1.62
--- wesnoth/src/server/server.cpp:1.61 Thu Dec 2 01:59:05 2004
+++ wesnoth/src/server/server.cpp Thu Dec 9 19:52:47 2004
@@ -276,7 +276,7 @@
}
config data;
- while((sock = network::receive_data(data)) != NULL) {
+ while((sock = network::receive_data(data)) !=
network::null_connection) {
metrics_.service_request();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src network.cpp network.hpp server/serv...,
Guillaume Melquiond <=