Author: suokko
Date: Sun Aug 31 01:33:59 2008
New Revision: 29126
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29126&view=rev
Log:
Fixed compilation for boost 1.33.0
Modified:
trunk/src/config_cache.cpp
trunk/src/config_cache.hpp
Modified: trunk/src/config_cache.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/config_cache.cpp?rev=29126&r1=29125&r2=29126&view=diff
==============================================================================
--- trunk/src/config_cache.cpp (original)
+++ trunk/src/config_cache.cpp Sun Aug 31 01:33:59 2008
@@ -264,6 +264,12 @@
add_defines_map_diff(copy_map);
}
+ void config_cache::add_define_from_file(const
config::all_children_iterator::value_type& value)
+ {
+ config_cache_transaction::instance().insert_to_active(
+ preproc_define::read_pair(value::second));
+ }
+
void config_cache::read_defines_file(const std::string& path)
{
config cfg;
@@ -274,13 +280,9 @@
// use static preproc_define::read_pair(config*) to make a
object
// and pass that object
config_cache_transaction::insert_to_active method
std::for_each(cfg.ordered_begin(), cfg.ordered_end(),
-
boost::bind(&config_cache_transaction::insert_to_active,
-
boost::ref(config_cache_transaction::instance()),
- boost::bind(&preproc_define::read_pair,
-
boost::bind(&config::all_children_iterator::value_type::second,
- _1)
- )
- )
+ boost::bind(&config_cache::add_define_from_file,
+ this,
+ _1)
);
boost::bind(&config::all_children_iterator::value_type::second,_1);
}
Modified: trunk/src/config_cache.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/config_cache.hpp?rev=29126&r1=29125&r2=29126&view=diff
==============================================================================
--- trunk/src/config_cache.hpp (original)
+++ trunk/src/config_cache.hpp Sun Aug 31 01:33:59 2008
@@ -98,6 +98,7 @@
void read_configs(const std::string& path, config& cfg,
preproc_map& defines);
void load_configs(const std::string& path, config& cfg);
void read_defines_queue();
+ void add_define_from_file(const
config::all_children_iterator::value_type& value)
void read_defines_file(const std::string& path);
preproc_map& make_copy_map();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
