upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 03:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixing bind problems using boost lambda?"

Browse Source 
Doesn't work with 1.34
This commit is contained in:
Pauli Nieminen 2008-08-31 09:40:22 +00:00
parent beb1e6bb3b
commit e160c2f9d1
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/config_cache.cpp
View File

@ -26,8 +26,6 @@
#include "serialization/binary_or_text.hpp" #include "serialization/binary_or_text.hpp"
#include "serialization/parser.hpp" #include "serialization/parser.hpp"
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#define ERR_CACHE LOG_STREAM(err, cache) #define ERR_CACHE LOG_STREAM(err, cache)
@ -266,7 +264,7 @@ namespace game_config {
add_defines_map_diff(copy_map); add_defines_map_diff(copy_map);
} }
void config_cache::add_define_from_file(const config::all_children_iterator::value_type value) const void config_cache::add_define_from_file(const config::all_children_iterator::value_type& value)
{ {
config_cache_transaction::instance().insert_to_active( config_cache_transaction::instance().insert_to_active(
preproc_define::read_pair(value.second)); preproc_define::read_pair(value.second));
@ -274,9 +272,6 @@ namespace game_config {
void config_cache::read_defines_file(const std::string& path) void config_cache::read_defines_file(const std::string& path)
{ {
using namespace boost::lambda;
boost::lambda::placeholder1_type X;
config cfg; config cfg;
read_file(path, cfg); read_file(path, cfg);
@ -285,9 +280,9 @@ namespace game_config {
// use static preproc_define::read_pair(config*) to make a object // use static preproc_define::read_pair(config*) to make a object
// and pass that object config_cache_transaction::insert_to_active method // and pass that object config_cache_transaction::insert_to_active method
std::for_each(cfg.ordered_begin(), cfg.ordered_end(), std::for_each(cfg.ordered_begin(), cfg.ordered_end(),
bind(&config_cache::add_define_from_file, boost::bind(&config_cache::add_define_from_file,
this, this,
X) _1)
); );
} }

2
src/config_cache.hpp
View File

@ -98,7 +98,7 @@ namespace game_config {
void read_configs(const std::string& path, config& cfg, preproc_map& defines); void read_configs(const std::string& path, config& cfg, preproc_map& defines);
void load_configs(const std::string& path, config& cfg); void load_configs(const std::string& path, config& cfg);
void read_defines_queue(); void read_defines_queue();
void add_define_from_file(const config::all_children_iterator::value_type value) const; void add_define_from_file(const config::all_children_iterator::value_type& value);
void read_defines_file(const std::string& path); void read_defines_file(const std::string& path);
preproc_map& make_copy_map(); preproc_map& make_copy_map();