* mln/canvas/browsing/backdiagonal2d.hh * mln/canvas/browsing/diagonal2d.hh * mln/canvas/browsing/directional.hh * mln/canvas/browsing/snake_fwd.hh * mln/canvas/browsing/snake_generic.hh * mln/value/qt/rgb32.hh --- milena/ChangeLog | 11 +++++++++++ milena/mln/canvas/browsing/backdiagonal2d.hh | 9 ++++++++- milena/mln/canvas/browsing/diagonal2d.hh | 8 +++++++- milena/mln/canvas/browsing/directional.hh | 7 ++++++- milena/mln/canvas/browsing/snake_fwd.hh | 8 +++++++- milena/mln/canvas/browsing/snake_generic.hh | 8 +++++++- milena/mln/value/qt/rgb32.hh | 10 ++++++++++ 7 files changed, 56 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 786011c..defd3c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-11-15 Guillaume Lazzara <z@lrde.epita.fr> + + Add missing MLN_WO_GLOBAL_VARS conditions. + + * mln/canvas/browsing/backdiagonal2d.hh + * mln/canvas/browsing/diagonal2d.hh + * mln/canvas/browsing/directional.hh + * mln/canvas/browsing/snake_fwd.hh + * mln/canvas/browsing/snake_generic.hh + * mln/value/qt/rgb32.hh + 2010-08-26 Guillaume Lazzara <z@lrde.epita.fr> * mln/accu/stat/deviation.hh: Set first template parameter of diff --git a/milena/mln/canvas/browsing/backdiagonal2d.hh b/milena/mln/canvas/browsing/backdiagonal2d.hh index a490ffe..bd680aa 100644 --- a/milena/mln/canvas/browsing/backdiagonal2d.hh +++ b/milena/mln/canvas/browsing/backdiagonal2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -91,8 +92,14 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + +# ifndef MLN_WO_GLOBAL_VARS + const backdiagonal2d_t backdiagonal2d; +# endif // ! MLN_WO_GLOBAL_VARS + + template <typename F> inline void diff --git a/milena/mln/canvas/browsing/diagonal2d.hh b/milena/mln/canvas/browsing/diagonal2d.hh index 2ba66c7..056375b 100644 --- a/milena/mln/canvas/browsing/diagonal2d.hh +++ b/milena/mln/canvas/browsing/diagonal2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -88,8 +89,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const diagonal2d_t diagonal2d; +# endif // ! MLN_WO_GLOBAL_VARS + + template <typename F> inline void diff --git a/milena/mln/canvas/browsing/directional.hh b/milena/mln/canvas/browsing/directional.hh index 85ae7f6..91b6ea6 100644 --- a/milena/mln/canvas/browsing/directional.hh +++ b/milena/mln/canvas/browsing/directional.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -96,8 +97,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const directional_t directional; +# endif // ! MLN_WO_GLOBAL_VARS + template <typename F> inline void diff --git a/milena/mln/canvas/browsing/snake_fwd.hh b/milena/mln/canvas/browsing/snake_fwd.hh index e67b594..ca6ecf2 100644 --- a/milena/mln/canvas/browsing/snake_fwd.hh +++ b/milena/mln/canvas/browsing/snake_fwd.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -90,8 +91,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const snake_fwd_t snake_fwd; +# endif // ! MLN_WO_GLOBAL_VARS + + template <typename F> inline void diff --git a/milena/mln/canvas/browsing/snake_generic.hh b/milena/mln/canvas/browsing/snake_generic.hh index 885431d..c4c1ae8 100644 --- a/milena/mln/canvas/browsing/snake_generic.hh +++ b/milena/mln/canvas/browsing/snake_generic.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -84,8 +85,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const snake_generic_t snake_generic; +# endif // ! MLN_WO_GLOBAL_VARS + + template <typename F> inline void diff --git a/milena/mln/value/qt/rgb32.hh b/milena/mln/value/qt/rgb32.hh index e35c667..511d6a7 100644 --- a/milena/mln/value/qt/rgb32.hh +++ b/milena/mln/value/qt/rgb32.hh @@ -369,6 +369,13 @@ namespace mln namespace qt { +# ifndef MLN_WO_GLOBAL_VARS + + const rgb32 rgb32::zero(0,0,0); + +# endif // !MLN_WO_GLOBAL_VARS + + /*---------------. | Construction. | `---------------*/ @@ -756,6 +763,7 @@ namespace mln namespace over_load { + // int_u -> qt::rgb32 template <unsigned m> void from_to_(const value::int_u<m>& from, value::qt::rgb32& to) @@ -774,6 +782,7 @@ namespace mln } + // qt::rgb32 -> bool inline void from_to_(const value::qt::rgb32& from, bool& to) { @@ -781,6 +790,7 @@ namespace mln } + // bool -> qt::rgb32 inline void from_to_(const bool& from, value::qt::rgb32& to) { -- 1.5.6.5