[Olena-patches] last-svn-commit-498-g949f1cb Fix `link' name lookup in Scribo.

* src/text_in_picture.cc: Help the C++ compiler not to mix up scribo::primitive::link with unistd.h's link(2). --- scribo/ChangeLog | 7 +++++++ scribo/src/text_in_picture.cc | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f9fc04..c4692cb 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-10-20 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Fix `link' name lookup in Scribo. + + * src/text_in_picture.cc: Help the C++ compiler not to mix up + scribo::primitive::link with unistd.h's link(2). + 2010-10-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Small fixes in Scribo diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 8f530db..5be498a 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -334,7 +334,7 @@ int main(int argc, char* argv[]) /// linking potential components timer_.restart(); mln::util::couple<object_links<L>, object_links<L> > - links = link::left_right(filtered_components); + links = scribo::primitive::link::left_right(filtered_components); object_links<L>& left_link = links.first(); object_links<L>& right_link = links.second(); @@ -370,8 +370,8 @@ int main(int argc, char* argv[]) // Validating left and right links. timer_.restart(); - object_links<L> - merged_links = link::merge_double_link(left_link, right_link); + object_links<L> merged_links = + scribo::primitive::link::merge_double_link(left_link, right_link); t_ = timer_; std::cout << "Right/Left Validation. " << t_ << std::endl; -- 1.5.6.5