[Wesnoth-cvs-commits] wesnoth/src display.cpp gamestatus.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/03/19 19:48:01

Modified files:
        src            : display.cpp gamestatus.cpp 

Log message:
        Move 'static' to the beginning of declaration.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.303&tr2=1.304&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gamestatus.cpp.diff?tr1=1.58&tr2=1.59&r1=text&r2=text

Patches:
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.303 wesnoth/src/display.cpp:1.304
--- wesnoth/src/display.cpp:1.303       Fri Mar 18 21:21:48 2005
+++ wesnoth/src/display.cpp     Sat Mar 19 19:48:01 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.303 2005/03/18 21:21:48 ydirson Exp $ */
+/* $Id: display.cpp,v 1.304 2005/03/19 19:48:01 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1623,7 +1623,7 @@
 namespace {
 const std::string& get_direction(size_t n)
 {
-       const static std::string dirs[6] = {"-n","-ne","-se","-s","-sw","-nw"};
+       static std::string const dirs[6] = { "-n", "-ne", "-se", "-s", "-sw", 
"-nw" };
        return dirs[n >= sizeof(dirs)/sizeof(*dirs) ? 0 : n];
 }
 
@@ -1631,13 +1631,13 @@
 
 bool angle_is_northern(size_t n)
 {
-       const static bool results[6] = {true,false,false,false,false,true};
+       static bool const results[6] = { true, false, false, false, false, true 
};
        return results[n >= sizeof(results)/sizeof(*results) ? 0 : n];
 }
 
 const std::string& get_angle_direction(size_t n)
 {
-       const static std::string dirs[6] = {"-ne","-e","-se","-sw","-w","-nw"};
+       static std::string const dirs[6] = { "-ne", "-e", "-se", "-sw", "-w", 
"-nw" };
        return dirs[n >= sizeof(dirs)/sizeof(*dirs) ? 0 : n];
 }
 
Index: wesnoth/src/gamestatus.cpp
diff -u wesnoth/src/gamestatus.cpp:1.58 wesnoth/src/gamestatus.cpp:1.59
--- wesnoth/src/gamestatus.cpp:1.58     Sat Mar  5 10:54:25 2005
+++ wesnoth/src/gamestatus.cpp  Sat Mar 19 19:48:01 2005
@@ -1,4 +1,4 @@
-/* $Id: gamestatus.cpp,v 1.58 2005/03/05 10:54:25 silene Exp $ */
+/* $Id: gamestatus.cpp,v 1.59 2005/03/19 19:48:01 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -142,7 +142,7 @@
                return times_[(nturn-1)%times_.size()];
        } else {
                config dummy_cfg;
-               const static time_of_day default_time(dummy_cfg);
+               static time_of_day const default_time(dummy_cfg);
                return default_time;
        }
 }
@@ -176,7 +176,7 @@
        }
 
        config dummy_cfg;
-       const static time_of_day default_time(dummy_cfg);
+       static time_of_day const default_time(dummy_cfg);
        return default_time;
 }