Fix some pedantic warnings.
This commit is contained in:
parent
62b0f4c120
commit
38243fa4bf
4 changed files with 21 additions and 21 deletions
|
@ -62,7 +62,7 @@ static lg::log_domain log_engine_tc("engine/team_construction");
|
|||
#define DBG_NG_TC LOG_STREAM(debug, log_engine_tc)
|
||||
|
||||
namespace {
|
||||
DEFAULT_TOKEN_BODY(z_NORMAL_default, "NORMAL");
|
||||
DEFAULT_TOKEN_BODY(z_NORMAL_default, "NORMAL")
|
||||
DEFAULT_TOKEN_BODY(z_label_default, "label")
|
||||
DEFAULT_TOKEN_BODY(z_parent_default, "parent")
|
||||
DEFAULT_TOKEN_BODY(z_version_default, "version")
|
||||
|
|
16
src/race.cpp
16
src/race.cpp
|
@ -27,14 +27,14 @@
|
|||
#include "simple_rng.hpp"
|
||||
|
||||
namespace {
|
||||
DEFAULT_TOKEN_BODY(zf_trait, "trait");
|
||||
DEFAULT_TOKEN_BODY(zf_topic, "topic");
|
||||
DEFAULT_TOKEN_BODY(zf_id, "id");
|
||||
DEFAULT_TOKEN_BODY(zf_plural_name, "plural_name");
|
||||
DEFAULT_TOKEN_BODY(zf_description, "description");
|
||||
DEFAULT_TOKEN_BODY(zf_num_traits, "num_traits");
|
||||
DEFAULT_TOKEN_BODY(zf_markov_chain_size, "markov_chain_size");
|
||||
DEFAULT_TOKEN_BODY(zf_ignore_global_traits, "ignore_global_traits");
|
||||
DEFAULT_TOKEN_BODY(zf_trait, "trait")
|
||||
DEFAULT_TOKEN_BODY(zf_topic, "topic")
|
||||
DEFAULT_TOKEN_BODY(zf_id, "id")
|
||||
DEFAULT_TOKEN_BODY(zf_plural_name, "plural_name")
|
||||
DEFAULT_TOKEN_BODY(zf_description, "description")
|
||||
DEFAULT_TOKEN_BODY(zf_num_traits, "num_traits")
|
||||
DEFAULT_TOKEN_BODY(zf_markov_chain_size, "markov_chain_size")
|
||||
DEFAULT_TOKEN_BODY(zf_ignore_global_traits, "ignore_global_traits")
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ static lg::log_domain log_display("display");
|
|||
namespace{
|
||||
//Static tokens are replacements for string literals in code
|
||||
//They allow for fast comparison operations.
|
||||
DEFAULT_TOKEN_BODY( zf_tile_image, "tile_image" );
|
||||
DEFAULT_TOKEN_BODY( zf_tile_image, "tile_image" )
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -24,17 +24,17 @@
|
|||
|
||||
namespace {
|
||||
//Create default value functions
|
||||
DEFAULT_TOKEN_BODY(zf_lawful_bonus, "lawful_bonus");
|
||||
DEFAULT_TOKEN_BODY(zf_name, "name");
|
||||
DEFAULT_TOKEN_BODY(zf_id, "id");
|
||||
DEFAULT_TOKEN_BODY(zf_image, "image");
|
||||
DEFAULT_TOKEN_BODY(zf_mask, "mask");
|
||||
DEFAULT_TOKEN_BODY(zf_red, "red");
|
||||
DEFAULT_TOKEN_BODY(zf_green, "green");
|
||||
DEFAULT_TOKEN_BODY(zf_blue, "blue");
|
||||
DEFAULT_TOKEN_BODY(zf_sound, "sound");
|
||||
DEFAULT_TOKEN_BODY(zf_NULL_TOD, "NULL_TOD");
|
||||
DEFAULT_TOKEN_BODY(zf_nulltod, "nulltod");
|
||||
DEFAULT_TOKEN_BODY(zf_lawful_bonus, "lawful_bonus")
|
||||
DEFAULT_TOKEN_BODY(zf_name, "name")
|
||||
DEFAULT_TOKEN_BODY(zf_id, "id")
|
||||
DEFAULT_TOKEN_BODY(zf_image, "image")
|
||||
DEFAULT_TOKEN_BODY(zf_mask, "mask")
|
||||
DEFAULT_TOKEN_BODY(zf_red, "red")
|
||||
DEFAULT_TOKEN_BODY(zf_green, "green")
|
||||
DEFAULT_TOKEN_BODY(zf_blue, "blue")
|
||||
DEFAULT_TOKEN_BODY(zf_sound, "sound")
|
||||
DEFAULT_TOKEN_BODY(zf_NULL_TOD, "NULL_TOD")
|
||||
DEFAULT_TOKEN_BODY(zf_nulltod, "nulltod")
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue