Mention namespace at several adobe::move calls
This commit is contained in:
parent
af244234d5
commit
9e20364e24
2 changed files with 45 additions and 1 deletions
|
|
@ -24,6 +24,7 @@ Patch2: asl-no-concept-check1043.patch
|
|||
Patch3: asl-time-utc.patch
|
||||
Patch4: asl-boost-1.50.patch
|
||||
Patch5: asl-C11.patch
|
||||
Patch6: asl-boost-1.57.patch
|
||||
|
||||
BuildRequires: boost-build
|
||||
BuildRequires: boost-devel
|
||||
|
|
@ -66,6 +67,7 @@ API and other documentation for Adobe Source Libraries (ASL).
|
|||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
find . \( -name *.hpp -o -name *.jpg \) -executable -exec chmod 644 {} \;
|
||||
iconv -f iso8859-1 -t utf-8 release_notes.txt > release_notes.txt.conv && \
|
||||
|
|
@ -141,8 +143,9 @@ ln -sf $sofile ${sofile%%.*.*.*}
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.0.43-24
|
||||
* Thu Jan 29 2015 Petr Machata <pmachata@redhat.com> - 1.0.43-24
|
||||
- Rebuild for boost 1.57.0
|
||||
- Mention namespace at several adobe::move calls (asl-boost-1.57.patch)
|
||||
|
||||
* Sat Oct 25 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.43-23
|
||||
- sync tbb arches
|
||||
|
|
|
|||
41
asl-boost-1.57.patch
Normal file
41
asl-boost-1.57.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
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
|
||||
Reference in a new issue