Commit e2e8ec06 authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix compilation with multiple files.

	* mln/canvas/browsing/backdiagonal2d.hh,
	* mln/canvas/browsing/breadth_first_search.hh,
	* mln/canvas/browsing/depth_first_search.hh,
	* mln/canvas/browsing/diagonal2d.hh,
	* mln/canvas/browsing/dir_struct_elt_incr_update.hh,
	* mln/canvas/browsing/directional.hh,
	* mln/canvas/browsing/fwd.hh,
	* mln/canvas/browsing/hyper_directional.hh,
	* mln/canvas/browsing/snake_fwd.hh,
	* mln/canvas/browsing/snake_generic.hh,
	* mln/canvas/browsing/snake_vert.hh,
	* mln/fun/v2v/hsi_to_rgb.hh,
	* mln/fun/v2v/rgb_to_hsi.hh,
	* mln/fun/v2v/rgb_to_hsl.hh,
	* mln/literal/black.hh,
	* mln/literal/colors.hh,
	* mln/literal/grays.hh,
	* mln/literal/max.hh,
	* mln/literal/min.hh,
	* mln/literal/white.hh: Add missing inline keyword and
	MLN_WO_GLOBAL_VARS guards.
parent ac769b6c
2011-11-23 Guillaume Lazzara <z@lrde.epita.fr>
Fix compilation with multiple files.
* mln/canvas/browsing/backdiagonal2d.hh,
* mln/canvas/browsing/breadth_first_search.hh,
* mln/canvas/browsing/depth_first_search.hh,
* mln/canvas/browsing/diagonal2d.hh,
* mln/canvas/browsing/dir_struct_elt_incr_update.hh,
* mln/canvas/browsing/directional.hh,
* mln/canvas/browsing/fwd.hh,
* mln/canvas/browsing/hyper_directional.hh,
* mln/canvas/browsing/snake_fwd.hh,
* mln/canvas/browsing/snake_generic.hh,
* mln/canvas/browsing/snake_vert.hh,
* mln/fun/v2v/hsi_to_rgb.hh,
* mln/fun/v2v/rgb_to_hsi.hh,
* mln/fun/v2v/rgb_to_hsl.hh,
* mln/literal/black.hh,
* mln/literal/colors.hh,
* mln/literal/grays.hh,
* mln/literal/max.hh,
* mln/literal/min.hh,
* mln/literal/white.hh: Add missing inline keyword and
MLN_WO_GLOBAL_VARS guards.
2011-11-23 Guillaume Lazzara <z@lrde.epita.fr> 2011-11-23 Guillaume Lazzara <z@lrde.epita.fr>
   
Fix more compilation issues with g++ 4.6.1 and clang++. Fix more compilation issues with g++ 4.6.1 and clang++.
...@@ -102,6 +102,7 @@ namespace mln ...@@ -102,6 +102,7 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
inline
backdiagonal2d_t::backdiagonal2d_t() backdiagonal2d_t::backdiagonal2d_t()
{ {
} }
......
...@@ -91,12 +91,17 @@ namespace mln ...@@ -91,12 +91,17 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
const breadth_first_search_t breadth_first_search; inline
breadth_first_search_t::breadth_first_search_t() breadth_first_search_t::breadth_first_search_t()
{ {
} }
# ifndef MLN_WO_GLOBAL_VARS
const breadth_first_search_t breadth_first_search;
# endif // ! MLN_WO_GLOBAL_VARS
# endif // ! MLN_INCLUDE_ONLY # endif // ! MLN_INCLUDE_ONLY
} // end of namespace mln::canvas::browsing } // end of namespace mln::canvas::browsing
......
...@@ -97,6 +97,7 @@ namespace mln ...@@ -97,6 +97,7 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
inline
depth_first_search_t::depth_first_search_t() depth_first_search_t::depth_first_search_t()
{ {
} }
......
...@@ -99,6 +99,7 @@ namespace mln ...@@ -99,6 +99,7 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
inline
diagonal2d_t::diagonal2d_t() diagonal2d_t::diagonal2d_t()
{ {
} }
......
...@@ -98,8 +98,13 @@ namespace mln ...@@ -98,8 +98,13 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
# ifndef MLN_WO_GLOBAL_VARS
const dir_struct_elt_incr_update_t dir_struct_elt_incr_update; const dir_struct_elt_incr_update_t dir_struct_elt_incr_update;
# endif // ! MLN_WO_GLOBAL_VARS
inline
dir_struct_elt_incr_update_t::dir_struct_elt_incr_update_t() dir_struct_elt_incr_update_t::dir_struct_elt_incr_update_t()
{ {
} }
......
...@@ -107,6 +107,7 @@ namespace mln ...@@ -107,6 +107,7 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
inline
directional_t::directional_t() directional_t::directional_t()
{ {
} }
......
...@@ -84,8 +84,14 @@ namespace mln ...@@ -84,8 +84,14 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
# ifndef MLN_WO_GLOBAL_VARS
const fwd_t fwd; const fwd_t fwd;
# endif // ! MLN_WO_GLOBAL_VARS
inline
fwd_t::fwd_t() fwd_t::fwd_t()
{ {
} }
......
...@@ -86,8 +86,14 @@ namespace mln ...@@ -86,8 +86,14 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
# ifndef MLN_WO_GLOBAL_VARS
const hyper_directional_t hyper_directional; const hyper_directional_t hyper_directional;
# endif // ! MLN_WO_GLOBAL_VARS
inline
hyper_directional_t::hyper_directional_t() hyper_directional_t::hyper_directional_t()
{ {
} }
......
...@@ -101,6 +101,7 @@ namespace mln ...@@ -101,6 +101,7 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
inline
snake_fwd_t::snake_fwd_t() snake_fwd_t::snake_fwd_t()
{ {
} }
......
...@@ -95,6 +95,7 @@ namespace mln ...@@ -95,6 +95,7 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
inline
snake_generic_t::snake_generic_t() snake_generic_t::snake_generic_t()
{ {
} }
......
...@@ -95,7 +95,9 @@ namespace mln ...@@ -95,7 +95,9 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
const snake_vert_t snake_vert = snake_vert_t(); # ifndef MLN_WO_GLOBAL_VARS
const snake_vert_t snake_vert;
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
......
...@@ -72,6 +72,8 @@ namespace mln ...@@ -72,6 +72,8 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
# ifndef MLN_WO_GLOBAL_VARS
/// Global variable. /// Global variable.
/// \{ /// \{
f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8;
...@@ -79,12 +81,12 @@ namespace mln ...@@ -79,12 +81,12 @@ namespace mln
# endif // ! MLN_WO_GLOBAL_VARS # endif // ! MLN_WO_GLOBAL_VARS
template <typename T_rgb> template <typename T_rgb>
f_hsi_to_rgb_<T_rgb>::f_hsi_to_rgb_() f_hsi_to_rgb_<T_rgb>::f_hsi_to_rgb_()
{ {
} }
template <typename T_rgb> template <typename T_rgb>
template <typename T_hsi> template <typename T_hsi>
inline inline
......
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // Copyright (C) 2008, 2009, 2011 EPITA Research and Development
// Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -63,11 +64,14 @@ namespace mln ...@@ -63,11 +64,14 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
# ifndef MLN_WO_GLOBAL_VARS
/// Global variables. /// Global variables.
/// \{ /// \{
f_rgb_to_hsi_f_t f_rgb_to_hsi_f; f_rgb_to_hsi_f_t f_rgb_to_hsi_f;
/// \} /// \}
# endif // ! MLN_WO_GLOBAL_VARS
template <typename T_hsi> template <typename T_hsi>
......
// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory // Copyright (C) 2008, 2009, 2011 EPITA Research and Development
// (LRDE) // Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -72,11 +72,14 @@ namespace mln ...@@ -72,11 +72,14 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
# ifndef MLN_WO_GLOBAL_VARS
/// Global variables. /// Global variables.
/// \{ /// \{
f_rgb_to_hsl_f_t f_rgb_to_hsl_f; f_rgb_to_hsl_f_t f_rgb_to_hsl_f;
/// \} /// \}
# endif // ! MLN_WO_GLOBAL_VARS
template <typename T_hsl> template <typename T_hsl>
f_rgb_to_hsl_f_t<T_hsl>::f_rgb_to_hsl_f_t() f_rgb_to_hsl_f_t<T_hsl>::f_rgb_to_hsl_f_t()
......
...@@ -65,6 +65,7 @@ namespace mln ...@@ -65,6 +65,7 @@ namespace mln
# endif # endif
inline
black_t::black_t() black_t::black_t()
{ {
} }
......
...@@ -195,58 +195,72 @@ namespace mln ...@@ -195,58 +195,72 @@ namespace mln
# ifndef MLN_INCLUDE_ONLY # ifndef MLN_INCLUDE_ONLY
inline
red_t::red_t() red_t::red_t()
{ {
} }
inline
green_t::green_t() green_t::green_t()
{ {
} }
inline
blue_t::blue_t() blue_t::blue_t()
{ {
} }
inline
brown_t::brown_t() brown_t::brown_t()
{ {
} }
inline
lime_t::lime_t() lime_t::lime_t()
{ {
} }
inline
orange_t::orange_t() orange_t::orange_t()
{ {
} }
inline
pink_t::pink_t() pink_t::pink_t()
{ {
} }
inline
purple_t::purple_t() purple_t::purple_t()
{ {
} }
inline
teal_t::teal_t() teal_t::teal_t()
{ {
} }
inline
violet_t::violet_t() violet_t::violet_t()
{ {
} }
inline
cyan_t::cyan_t() cyan_t::cyan_t()
{ {
} }
inline
magenta_t::magenta_t() magenta_t::magenta_t()
{ {
} }
inline
yellow_t::yellow_t() yellow_t::yellow_t()
{ {
} }
inline
olive_t::olive_t() olive_t::olive_t()
{ {
} }
......
...@@ -72,7 +72,11 @@ namespace mln ...@@ -72,7 +72,11 @@ namespace mln
} }
const max_t& max = max_t(); # ifndef MLN_WO_GLOBAL_VARS
const max_t max;
# endif // ! MLN_WO_GLOBAL_VARS
# endif // ! MLN_INCLUDE_ONLY # endif // ! MLN_INCLUDE_ONLY
......
...@@ -70,8 +70,11 @@ namespace mln ...@@ -70,8 +70,11 @@ namespace mln
return mln_min(T); return mln_min(T);
} }
# ifndef MLN_WO_GLOBAL_VARS
const min_t& min = min_t(); const min_t min;
# endif // ! MLN_WO_GLOBAL_VARS
# endif // ! MLN_INCLUDE_ONLY # endif // ! MLN_INCLUDE_ONLY
......
...@@ -65,6 +65,7 @@ namespace mln ...@@ -65,6 +65,7 @@ namespace mln
# endif # endif
inline
white_t::white_t() white_t::white_t()
{ {
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment