diff -up source_release/source/adam.cpp\~ source_release/source/adam.cpp --- source_release/source/adam.cpp~ 2010-11-08 19:19:49.000000000 +0100 +++ source_release/source/adam.cpp 2015-01-29 01:09:20.085293825 +0100 @@ -576,7 +576,7 @@ void sheet_t::add_constant(name_t consta { object_m->add_constant(constant, position, initializer); } void sheet_t::add_constant(name_t name, any_regular_t value) -{ object_m->add_constant(name, move(value)); } +{ object_m->add_constant(name, adobe::move(value)); } void sheet_t::add_logic(name_t logic, const line_position_t& position, const array_t& expression) { object_m->add_logic(logic, position, expression); } @@ -591,7 +591,7 @@ void sheet_t::add_interface(name_t name, { object_m->add_interface(name, linked, position1, initializer, position2, expression); } void sheet_t::add_interface(name_t name, any_regular_t initial) -{ object_m->add_interface(name, move(initial)); } +{ object_m->add_interface(name, adobe::move(initial)); } void sheet_t::add_relation(const line_position_t& position, const array_t& conditional, const relation_t* first, const relation_t* last) @@ -835,7 +835,7 @@ void sheet_t::implementation_t::add_inte input_index_m.insert(cell); - cell.state_m = move(initial); + cell.state_m = adobe::move(initial); cell.priority_m = ++priority_high_m; cell_set_m.push_back(cell_t(access_interface_output, name, @@ -870,7 +870,7 @@ void sheet_t::implementation_t::add_cons void sheet_t::implementation_t::add_constant(name_t name, any_regular_t value) { - cell_set_m.push_back(cell_t(access_constant, name, move(value), cell_set_m.size())); + cell_set_m.push_back(cell_t(access_constant, name, adobe::move(value), cell_set_m.size())); if (!name_index_m.insert(cell_set_m.back()).second) { throw std::logic_error(make_string("cell named '", name.c_str(), "'already exists.")); Diff finished. Thu Jan 29 01:09:42 2015