Author: suokko
Date: Mon Sep 1 01:18:12 2008
New Revision: 29150
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29150&view=rev
Log:
Fixed compilation with boost 1.33
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=29150&r1=29149&r2=29150&view=diff
==============================================================================
--- trunk/src/config_cache.cpp (original)
+++ trunk/src/config_cache.cpp Mon Sep 1 01:18:12 2008
@@ -264,11 +264,6 @@
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)
{
@@ -280,10 +275,7 @@
// 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::add_define_from_file,
- this,
- _1)
- );
+ add_define_from_file());
}
void config_cache::read_defines_queue()
Modified: trunk/src/config_cache.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/config_cache.hpp?rev=29150&r1=29149&r2=29150&view=diff
==============================================================================
--- trunk/src/config_cache.hpp (original)
+++ trunk/src/config_cache.hpp Mon Sep 1 01:18:12 2008
@@ -98,7 +98,6 @@
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();
@@ -171,6 +170,7 @@
};
+ struct add_define_from_file;
class fake_transaction;
/**
* Used to share macros between load operations
@@ -207,12 +207,22 @@
static config_cache_transaction& instance()
{ assert(active_); return *active_; }
friend class config_cache;
+ friend class add_define_from_file;
friend class fake_transaction;
const filenames& get_define_files() const;
void add_define_file(const std::string&);
preproc_map& get_active_map(const preproc_map&);
void add_defines_map_diff(preproc_map& defines_map);
};
+
+ struct add_define_from_file {
+ void operator()(const
config::all_children_iterator::value_type& value) const
+ {
+ config_cache_transaction::instance().insert_to_active(
+
preproc_define::read_pair(value.second));
+ }
+ };
+
/**
* Holds a fake cache transaction if no real one is used
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
