upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-14 21:19:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added move operators to class config,

Browse Source 
...in order to speed up standard containers (e.g. std::vector).
This commit is contained in:
Guillaume Melquiond 2010-10-31 08:44:19 +00:00
parent 1e4eab72fc
commit 63caf15a2f
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/config.cpp
View File

@ -209,6 +209,22 @@ config& config::operator=(const config& cfg)
return *this; return *this;
} }
#ifdef HAVE_CXX0X
config::config(config &&cfg):
values(std::move(cfg.values)),
children(std::move(cfg.children)),
ordered_children(std::move(cfg.ordered_children))
{
}
config &config::operator=(config &&cfg)
{
clear();
swap(cfg);
return *this;
}
#endif
bool config::has_attribute(const std::string &key) const bool config::has_attribute(const std::string &key) const
{ {
check_valid(); check_valid();

9
src/config.hpp
View File

@ -79,7 +79,13 @@ public:
// Create an empty node. // Create an empty node.
config(); config();
config(const config& cfg); config(const config &);
config &operator=(const config &);
#ifdef HAVE_CXX0X
config(config &&);
config &operator=(config &&);
#endif
/** /**
* Creates a config object with an empty child of name @a child. * Creates a config object with an empty child of name @a child.
@ -88,7 +94,6 @@ public:
~config(); ~config();
config& operator=(const config& cfg);
#ifdef HAVE_CXX0X #ifdef HAVE_CXX0X
explicit operator bool() const explicit operator bool() const