summaryrefslogtreecommitdiff
path: root/src/settings.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-21 11:51:29 +0200
committerGitHub <noreply@github.com>2017-06-21 11:51:29 +0200
commit1425c6def156840b359b90b4f32b9c7b8f005731 (patch)
tree0390ed5ad9bcf481416061446f859b3f48955422 /src/settings.h
parent12aad731adef495dec03f384d10b4f8f57b6a1d3 (diff)
downloadminetest-1425c6def156840b359b90b4f32b9c7b8f005731.tar.gz
minetest-1425c6def156840b359b90b4f32b9c7b8f005731.tar.bz2
minetest-1425c6def156840b359b90b4f32b9c7b8f005731.zip
Cpp11 initializers: last src root changeset (#6022)
* Cpp11 initializers: last src root changeset Finish to migrate all src root folder files to C++11 constructor initializers
Diffstat (limited to 'src/settings.h')
-rw-r--r--src/settings.h15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/settings.h b/src/settings.h
index d1edca6b6..c4b94d67d 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -73,15 +73,10 @@ struct ValueSpec {
};
struct SettingsEntry {
- SettingsEntry() :
- group(NULL),
- is_group(false)
- {}
+ SettingsEntry() {}
SettingsEntry(const std::string &value_) :
- value(value_),
- group(NULL),
- is_group(false)
+ value(value_)
{}
SettingsEntry(Settings *group_) :
@@ -89,9 +84,9 @@ struct SettingsEntry {
is_group(true)
{}
- std::string value;
- Settings *group;
- bool is_group;
+ std::string value = "";
+ Settings *group = nullptr;
+ bool is_group = false;
};
typedef std::unordered_map<std::string, SettingsEntry> SettingEntries;