Author: dragonking
Date: Sat Jun 28 12:42:14 2008
New Revision: 27549
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27549&view=rev
Log:
Fix to variant_iterator
Modified:
trunk/src/variant.cpp
Modified: trunk/src/variant.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/variant.cpp?rev=27549&r1=27548&r2=27549&view=diff
==============================================================================
--- trunk/src/variant.cpp (original)
+++ trunk/src/variant.cpp Sat Jun 28 12:42:14 2008
@@ -67,16 +67,16 @@
std::cerr << "ERROR: " << message << "\n" << get_call_stack();
}
-variant_iterator::variant_iterator() : type_(TYPE_NULL), list_iterator_(NULL),
map_iterator_(NULL)
+variant_iterator::variant_iterator() : type_(TYPE_NULL)
{}
variant_iterator::variant_iterator(const variant_iterator& iter) :
type_(iter.type_), list_iterator_(iter.list_iterator_),
map_iterator_(iter.map_iterator_)
{}
-variant_iterator::variant_iterator(const std::vector<variant>::iterator& iter)
: type_(TYPE_LIST), list_iterator_(iter), map_iterator_(NULL)
+variant_iterator::variant_iterator(const std::vector<variant>::iterator& iter)
: type_(TYPE_LIST), list_iterator_(iter)
{}
-variant_iterator::variant_iterator(const std::map<variant, variant>::iterator&
iter) : type_(TYPE_MAP), list_iterator_(NULL), map_iterator_(iter)
+variant_iterator::variant_iterator(const std::map<variant, variant>::iterator&
iter) : type_(TYPE_MAP), map_iterator_(iter)
{}
variant variant_iterator::operator*() const
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits