[Olena-patches] last-svn-commit-821-gaa0ecbc Fix namespace ambiguities.

* src/debug/show_groups_bboxes.cc, * src/debug/show_links_bottom_aligned_2angles.cc, * src/debug/show_links_top_aligned_2angles.cc: Add primitive:: prefix. --- scribo/ChangeLog | 9 +++++++++ scribo/src/debug/show_groups_bboxes.cc | 2 +- .../src/debug/show_links_bottom_aligned_2angles.cc | 8 +++++--- scribo/src/debug/show_links_top_aligned_2angles.cc | 7 ++++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 325a0ab..baca941 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix namespace ambiguities. + + * src/debug/show_groups_bboxes.cc, + * src/debug/show_links_bottom_aligned_2angles.cc, + * src/debug/show_links_top_aligned_2angles.cc: Add primitive:: + prefix. + +2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * src/Makefile.am: define HAVE_QT for content_in_doc. 2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; diff --git a/scribo/src/debug/show_groups_bboxes.cc b/scribo/src/debug/show_groups_bboxes.cc index eff0eb7..58c45d0 100644 --- a/scribo/src/debug/show_groups_bboxes.cc +++ b/scribo/src/debug/show_groups_bboxes.cc @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) object_links<L> - left_link = link::with_single_left_link_dmax_ratio( + left_link = primitive::link::with_single_left_link_dmax_ratio( components, // primitive::link::internal::dmax_width_and_height(1), link::internal::dmax_default(1), diff --git a/scribo/src/debug/show_links_bottom_aligned_2angles.cc b/scribo/src/debug/show_links_bottom_aligned_2angles.cc index 4b0e765..05fdca9 100644 --- a/scribo/src/debug/show_links_bottom_aligned_2angles.cc +++ b/scribo/src/debug/show_links_bottom_aligned_2angles.cc @@ -88,11 +88,13 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); - link::internal::single_right_dmax_ratio_aligned_functor<L,link::internal::dmax_default> - functor(components, link::internal::dmax_default(atof(argv[2])), + primitive::link::internal::single_right_dmax_ratio_aligned_functor< + L,primitive::link::internal::dmax_default> + + functor(components, primitive::link::internal::dmax_default(atof(argv[2])), atof(argv[3]), atof(argv[4]), anchor::StrictBottomCenter); - object_links<L> output = link::compute(functor, anchor::Bottom); + object_links<L> output = primitive::link::compute(functor, anchor::Bottom); scribo::debug::logger().set_level(scribo::debug::None); diff --git a/scribo/src/debug/show_links_top_aligned_2angles.cc b/scribo/src/debug/show_links_top_aligned_2angles.cc index 48f3a13..59692cf 100644 --- a/scribo/src/debug/show_links_top_aligned_2angles.cc +++ b/scribo/src/debug/show_links_top_aligned_2angles.cc @@ -88,11 +88,12 @@ int main(int argc, char* argv[]) scribo::debug::logger().set_level(scribo::debug::All); - link::internal::single_right_dmax_ratio_aligned_functor<L,link::internal::dmax_default> - functor(components, link::internal::dmax_default(atof(argv[2])), + primitive::link::internal::single_right_dmax_ratio_aligned_functor< + L,primitive::link::internal::dmax_default> + functor(components, primitive::link::internal::dmax_default(atof(argv[2])), atof(argv[3]), atof(argv[4]), anchor::StrictTopCenter); - object_links<L> output = link::compute(functor, anchor::Top); + object_links<L> output = primitive::link::compute(functor, anchor::Top); scribo::debug::logger().set_level(scribo::debug::None); -- 1.5.6.5