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