Author: mordante
Date: Sun Jun 22 09:11:32 2008
New Revision: 27383
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27383&view=rev
Log:
Initialize all members.
Modified:
trunk/src/unit_map.hpp
Modified: trunk/src/unit_map.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_map.hpp?rev=27383&r1=27382&r2=27383&view=diff
==============================================================================
--- trunk/src/unit_map.hpp (original)
+++ trunk/src/unit_map.hpp Sun Jun 22 09:11:32 2008
@@ -72,7 +72,7 @@
public:
- unit_map() : num_iters_(0), num_invalid_(0) { };
+ unit_map() : map_(), lmap_(), num_iters_(0), num_invalid_(0) { };
unit_map(const unit_map &that);
unit_map &operator =(const unit_map &that);
/** A unit map with a copy of a single unit in it. */
@@ -100,7 +100,11 @@
*/
struct unit_iterator
{
- unit_iterator() { }
+ unit_iterator() :
+ counter(),
+ i_(),
+ map_(0)
+ { }
unit_iterator(const unit_iterator &i) : counter(i.map_),
i_(i.i_), map_(i.map_) { }
unit_iterator(umap::iterator i, unit_map* map) : counter(map),
i_(i), map_(map) { }
@@ -138,7 +142,11 @@
{
const_unit_iterator(const unit_iterator &i) : counter(i.map_),
i_(i.i_), map_(i.map_) { }
- const_unit_iterator() { }
+ const_unit_iterator() :
+ counter(),
+ i_(),
+ map_(0)
+ { }
const_unit_iterator(const const_unit_iterator &i) :
counter(i.map_), i_(i.i_), map_(i.map_) { }
const_unit_iterator(umap::const_iterator i, const unit_map*
map): counter(map), i_(i), map_(map) { }
@@ -182,10 +190,20 @@
{
unit_xy_iterator(const unit_iterator &i);
- unit_xy_iterator() { }
+ unit_xy_iterator() :
+ counter(),
+ i_(),
+ map_(0),
+ loc_()
+ {}
- unit_xy_iterator(const unit_xy_iterator &i) : counter(i.map_),
i_(i.i_), map_(i.map_)
- { if (i.valid()) loc_ = i.loc_; }
+ unit_xy_iterator(const unit_xy_iterator &i) :
+ counter(i.map_),
+ i_(i.i_),
+ map_(i.map_),
+ loc_(i.valid() ? i.loc_ : gamemap::location())
+ {
+ }
unit_xy_iterator(umap::iterator i, unit_map* map,
gamemap::location loc): counter(map), i_(i), map_(map), loc_(loc) { }
@@ -222,14 +240,31 @@
const_unit_xy_iterator(const unit_iterator &i);
const_unit_xy_iterator(const const_unit_iterator &i);
- const_unit_xy_iterator() { }
+ const_unit_xy_iterator() :
+ counter(),
+ i_(),
+ map_(0),
+ loc_()
+ {
+ }
const_unit_xy_iterator(umap::const_iterator i, const unit_map*
map, gamemap::location loc): counter(map), i_(i), map_(map), loc_(loc) { }
- const_unit_xy_iterator(const unit_xy_iterator &i) :
counter(i.map_), i_(i.i_), map_(i.map_)
- { if (i.valid()) loc_ = i.loc_; }
- const_unit_xy_iterator(const const_unit_xy_iterator &i) :
counter(i.map_), i_(i.i_), map_(i.map_)
- { if (i.valid()) loc_ = i.loc_; }
+ const_unit_xy_iterator(const unit_xy_iterator &i) :
+ counter(i.map_),
+ i_(i.i_),
+ map_(i.map_),
+ loc_(i.valid() ? i.loc_ : gamemap::location())
+ {
+ }
+
+ const_unit_xy_iterator(const const_unit_xy_iterator &i) :
+ counter(i.map_),
+ i_(i.i_),
+ map_(i.map_),
+ loc_(i.valid() ? i.loc_ : gamemap::location())
+ {
+ }
const std::pair<gamemap::location,unit>* operator->() const;
const std::pair<gamemap::location,unit>& operator*() const;
@@ -265,7 +300,13 @@
{
xy_accessor(const unit_iterator &i);
xy_accessor(const unit_xy_iterator &i);
- xy_accessor() { }
+ xy_accessor() :
+ counter(),
+ i_(),
+ map_(),
+ loc_()
+ {
+ }
std::pair<gamemap::location,unit>* operator->();
std::pair<gamemap::location,unit>& operator*();
@@ -288,7 +329,13 @@
const_xy_accessor(const const_unit_iterator &i);
const_xy_accessor(const const_unit_xy_iterator &i);
- const_xy_accessor() { }
+ const_xy_accessor() :
+ counter(),
+ i_(),
+ map_(),
+ loc_()
+ {
+ }
const std::pair<gamemap::location,unit>* operator->();
const std::pair<gamemap::location,unit>& operator*();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
