- Olena-patches

588: Adjust header guards to match the file name in Extended.
by Roland Levillain 28 Sep '06

28 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/extended Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * xtd/abstract/fun.hh, xtd/abstract/fun_expr.hh, * xtd/abstract/fun_nary_expr.hh, xtd/abstract/meta_fun.hh, * xtd/abstract/meta_nary_fun.hh, xtd/abstract/nary_fun.hh, * xtd/abstract/open_fun.hh, xtd/abstract/open_nary_fun.hh, * xtd/abstract/plain_fun.hh, xtd/abstract/plain_nary_fun.hh, * xtd/builtin/traits.hh, xtd/internal/mlc.hh, * xtd/internal/opmacros.hh, xtd/math/abs.hh, xtd/math/acos.hh, * xtd/math/arith.hh, xtd/math/asin.hh, xtd/math/atan.hh, * xtd/math/atan2.hh, xtd/math/ceil.hh, xtd/math/cmp.hh, * xtd/math/constraints.hh, xtd/math/cos.hh, xtd/math/cosh.hh, * xtd/math/exp.hh, xtd/math/floor.hh, xtd/math/id.hh, * xtd/math/includes.hh, xtd/math/log.hh, xtd/math/log10.hh, * xtd/math/logic.hh, xtd/math/pow.hh, xtd/math/sin.hh, * xtd/math/sinh.hh, xtd/math/sqrt.hh, xtd/math/tan.hh, * xtd/math/tanh.hh, xtd/arg.hh,* xtd/args.hh, xtd/bind.hh, * xtd/cast.hh, xtd/cfun.hh, xtd/literal.hh, xtd/math.hh, * xtd/mexpr.hh, xtd/mfun.hh, xtd/optraits.hh, xtd/res.hh, * xtd/traits.hh, xtd/vec.hh: Adjust header guards to match the file name. abstract/fun.hh | 6 +++--- abstract/fun_expr.hh | 6 +++--- abstract/fun_nary_expr.hh | 6 +++--- abstract/meta_fun.hh | 6 +++--- abstract/meta_nary_fun.hh | 6 +++--- abstract/nary_fun.hh | 6 +++--- abstract/open_fun.hh | 6 +++--- abstract/open_nary_fun.hh | 6 +++--- abstract/plain_fun.hh | 6 +++--- abstract/plain_nary_fun.hh | 6 +++--- arg.hh | 6 +++--- args.hh | 6 +++--- bind.hh | 6 +++--- builtin/traits.hh | 6 +++--- cast.hh | 6 +++--- cfun.hh | 6 +++--- internal/mlc.hh | 6 +++--- internal/opmacros.hh | 6 +++--- literal.hh | 6 +++--- math.hh | 6 +++--- math/abs.hh | 6 +++--- math/acos.hh | 6 +++--- math/arith.hh | 6 +++--- math/asin.hh | 6 +++--- math/atan.hh | 6 +++--- math/atan2.hh | 6 +++--- math/ceil.hh | 6 +++--- math/cmp.hh | 6 +++--- math/constraints.hh | 6 +++--- math/cos.hh | 6 +++--- math/cosh.hh | 6 +++--- math/exp.hh | 6 +++--- math/floor.hh | 6 +++--- math/id.hh | 6 +++--- math/includes.hh | 6 +++--- math/log.hh | 6 +++--- math/log10.hh | 6 +++--- math/logic.hh | 6 +++--- math/pow.hh | 6 +++--- math/sin.hh | 6 +++--- math/sinh.hh | 6 +++--- math/sqrt.hh | 6 +++--- math/tan.hh | 6 +++--- math/tanh.hh | 6 +++--- mexpr.hh | 6 +++--- mfun.hh | 6 +++--- optraits.hh | 6 +++--- res.hh | 6 +++--- traits.hh | 6 +++--- vec.hh | 6 +++--- 50 files changed, 150 insertions(+), 150 deletions(-) Index: xtd/math.hh --- xtd/math.hh (revision 587) +++ xtd/math.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_HH -# define EXTENDED_MATH_HH +#ifndef XTD_MATH_HH +# define XTD_MATH_HH @@ -86,4 +86,4 @@ -#endif // ! EXTENDED_MATH_HH +#endif // ! XTD_MATH_HH Index: xtd/res.hh --- xtd/res.hh (revision 587) +++ xtd/res.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_RES_HH -# define EXTENDED_RES_HH +#ifndef XTD_RES_HH +# define XTD_RES_HH # include <xtd/internal/mlc.hh> @@ -302,4 +302,4 @@ -#endif // ! EXTENDED_RES_HH +#endif // ! XTD_RES_HH Index: xtd/cast.hh --- xtd/cast.hh (revision 587) +++ xtd/cast.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_CAST_HH -# define EXTENDED_CAST_HH +#ifndef XTD_CAST_HH +# define XTD_CAST_HH # include <xtd/abstract/plain_nary_fun.hh> # include <xtd/abstract/meta_nary_fun.hh> @@ -121,4 +121,4 @@ -#endif // ! EXTENDED_CAST_HH +#endif // ! XTD_CAST_HH Index: xtd/math/log.hh --- xtd/math/log.hh (revision 587) +++ xtd/math/log.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_LOG_HH -# define EXTENDED_MATH_LOG_HH +#ifndef XTD_MATH_LOG_HH +# define XTD_MATH_LOG_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_LOG_HH +#endif // ! XTD_MATH_LOG_HH Index: xtd/math/floor.hh --- xtd/math/floor.hh (revision 587) +++ xtd/math/floor.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_FLOOR_HH -# define EXTENDED_MATH_FLOOR_HH +#ifndef XTD_MATH_FLOOR_HH +# define XTD_MATH_FLOOR_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_FLOOR_HH +#endif // ! XTD_MATH_FLOOR_HH Index: xtd/math/tan.hh --- xtd/math/tan.hh (revision 587) +++ xtd/math/tan.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_TAN_HH -# define EXTENDED_MATH_TAN_HH +#ifndef XTD_MATH_TAN_HH +# define XTD_MATH_TAN_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_TAN_HH +#endif // ! XTD_MATH_TAN_HH Index: xtd/math/log10.hh --- xtd/math/log10.hh (revision 587) +++ xtd/math/log10.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_LOG10_HH -# define EXTENDED_MATH_LOG10_HH +#ifndef XTD_MATH_LOG10_HH +# define XTD_MATH_LOG10_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_LOG10_HH +#endif // ! XTD_MATH_LOG10_HH Index: xtd/math/atan.hh --- xtd/math/atan.hh (revision 587) +++ xtd/math/atan.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ATAN_HH -# define EXTENDED_MATH_ATAN_HH +#ifndef XTD_MATH_ATAN_HH +# define XTD_MATH_ATAN_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_ATAN_HH +#endif // ! XTD_MATH_ATAN_HH Index: xtd/math/cos.hh --- xtd/math/cos.hh (revision 587) +++ xtd/math/cos.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_COS_HH -# define EXTENDED_MATH_COS_HH +#ifndef XTD_MATH_COS_HH +# define XTD_MATH_COS_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_COS_HH +#endif // ! XTD_MATH_COS_HH Index: xtd/math/acos.hh --- xtd/math/acos.hh (revision 587) +++ xtd/math/acos.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ACOS_HH -# define EXTENDED_MATH_ACOS_HH +#ifndef XTD_MATH_ACOS_HH +# define XTD_MATH_ACOS_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_ACOS_HH +#endif // ! XTD_MATH_ACOS_HH Index: xtd/math/sqrt.hh --- xtd/math/sqrt.hh (revision 587) +++ xtd/math/sqrt.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_SQRT_HH -# define EXTENDED_MATH_SQRT_HH +#ifndef XTD_MATH_SQRT_HH +# define XTD_MATH_SQRT_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_SQRT_HH +#endif // ! XTD_MATH_SQRT_HH Index: xtd/math/sin.hh --- xtd/math/sin.hh (revision 587) +++ xtd/math/sin.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_SIN_HH -# define EXTENDED_MATH_SIN_HH +#ifndef XTD_MATH_SIN_HH +# define XTD_MATH_SIN_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_SIN_HH +#endif // ! XTD_MATH_SIN_HH Index: xtd/math/tanh.hh --- xtd/math/tanh.hh (revision 587) +++ xtd/math/tanh.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_TANH_HH -# define EXTENDED_MATH_TANH_HH +#ifndef XTD_MATH_TANH_HH +# define XTD_MATH_TANH_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_TANH_HH +#endif // ! XTD_MATH_TANH_HH Index: xtd/math/asin.hh --- xtd/math/asin.hh (revision 587) +++ xtd/math/asin.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ASIN_HH -# define EXTENDED_MATH_ASIN_HH +#ifndef XTD_MATH_ASIN_HH +# define XTD_MATH_ASIN_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_ASIN_HH +#endif // ! XTD_MATH_ASIN_HH Index: xtd/math/cosh.hh --- xtd/math/cosh.hh (revision 587) +++ xtd/math/cosh.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_COSH_HH -# define EXTENDED_MATH_COSH_HH +#ifndef XTD_MATH_COSH_HH +# define XTD_MATH_COSH_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_COSH_HH +#endif // ! XTD_MATH_COSH_HH Index: xtd/math/id.hh --- xtd/math/id.hh (revision 587) +++ xtd/math/id.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ID_HH -# define EXTENDED_MATH_ID_HH +#ifndef XTD_MATH_ID_HH +# define XTD_MATH_ID_HH # include <xtd/math/includes.hh> @@ -64,4 +64,4 @@ -#endif // ! EXTENDED_MATH_ID_HH +#endif // ! XTD_MATH_ID_HH Index: xtd/math/exp.hh --- xtd/math/exp.hh (revision 587) +++ xtd/math/exp.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_EXP_HH -# define EXTENDED_MATH_EXP_HH +#ifndef XTD_MATH_EXP_HH +# define XTD_MATH_EXP_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_EXP_HH +#endif // ! XTD_MATH_EXP_HH Index: xtd/math/logic.hh --- xtd/math/logic.hh (revision 587) +++ xtd/math/logic.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_LOGIC_HH -# define EXTENDED_MATH_LOGIC_HH +#ifndef XTD_MATH_LOGIC_HH +# define XTD_MATH_LOGIC_HH # include <xtd/internal/opmacros.hh> @@ -45,4 +45,4 @@ -#endif // ! EXTENDED_MATH_LOGIC_HH +#endif // ! XTD_MATH_LOGIC_HH Index: xtd/math/sinh.hh --- xtd/math/sinh.hh (revision 587) +++ xtd/math/sinh.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_SINH_HH -# define EXTENDED_MATH_SINH_HH +#ifndef XTD_MATH_SINH_HH +# define XTD_MATH_SINH_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_SINH_HH +#endif // ! XTD_MATH_SINH_HH Index: xtd/math/abs.hh --- xtd/math/abs.hh (revision 587) +++ xtd/math/abs.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ABS_HH -# define EXTENDED_MATH_ABS_HH +#ifndef XTD_MATH_ABS_HH +# define XTD_MATH_ABS_HH # include <xtd/math/includes.hh> @@ -112,4 +112,4 @@ -#endif // ! EXTENDED_MATH_ABS_HH +#endif // ! XTD_MATH_ABS_HH Index: xtd/math/pow.hh --- xtd/math/pow.hh (revision 587) +++ xtd/math/pow.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_POW_HH -# define EXTENDED_MATH_POW_HH +#ifndef XTD_MATH_POW_HH +# define XTD_MATH_POW_HH # include <xtd/math/includes.hh> @@ -107,4 +107,4 @@ -#endif // ! EXTENDED_MATH_POW_HH +#endif // ! XTD_MATH_POW_HH Index: xtd/math/atan2.hh --- xtd/math/atan2.hh (revision 587) +++ xtd/math/atan2.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ATAN2_HH -# define EXTENDED_MATH_ATAN2_HH +#ifndef XTD_MATH_ATAN2_HH +# define XTD_MATH_ATAN2_HH # include <xtd/math/includes.hh> @@ -91,4 +91,4 @@ -#endif // ! EXTENDED_MATH_ATAN2_HH +#endif // ! XTD_MATH_ATAN2_HH Index: xtd/math/includes.hh --- xtd/math/includes.hh (revision 587) +++ xtd/math/includes.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_INCLUDES_HH -# define EXTENDED_MATH_INCLUDES_HH +#ifndef XTD_MATH_INCLUDES_HH +# define XTD_MATH_INCLUDES_HH # include <cmath> @@ -37,4 +37,4 @@ # include <xtd/math/constraints.hh> -#endif // ! EXTENDED_MATH_INCLUDES_HH +#endif // ! XTD_MATH_INCLUDES_HH Index: xtd/math/arith.hh --- xtd/math/arith.hh (revision 587) +++ xtd/math/arith.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_ARITH_HH -# define EXTENDED_MATH_ARITH_HH +#ifndef XTD_MATH_ARITH_HH +# define XTD_MATH_ARITH_HH # include <xtd/internal/opmacros.hh> @@ -48,4 +48,4 @@ -#endif // ! EXTENDED_MATH_ARITH_HH +#endif // ! XTD_MATH_ARITH_HH Index: xtd/math/constraints.hh --- xtd/math/constraints.hh (revision 587) +++ xtd/math/constraints.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_CONSTRAINTS_HH -# define EXTENDED_MATH_CONSTRAINTS_HH +#ifndef XTD_MATH_CONSTRAINTS_HH +# define XTD_MATH_CONSTRAINTS_HH # include <mlc/abort.hh> @@ -60,4 +60,4 @@ -#endif // ! EXTENDED_MATH_CONSTRAINTS_HH +#endif // ! XTD_MATH_CONSTRAINTS_HH Index: xtd/math/ceil.hh --- xtd/math/ceil.hh (revision 587) +++ xtd/math/ceil.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_CEIL_HH -# define EXTENDED_MATH_CEIL_HH +#ifndef XTD_MATH_CEIL_HH +# define XTD_MATH_CEIL_HH # include <xtd/math/includes.hh> @@ -90,4 +90,4 @@ -#endif // ! EXTENDED_MATH_CEIL_HH +#endif // ! XTD_MATH_CEIL_HH Index: xtd/math/cmp.hh --- xtd/math/cmp.hh (revision 587) +++ xtd/math/cmp.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MATH_CMP_HH -# define EXTENDED_MATH_CMP_HH +#ifndef XTD_MATH_CMP_HH +# define XTD_MATH_CMP_HH # include <xtd/internal/opmacros.hh> @@ -46,4 +46,4 @@ -#endif // ! EXTENDED_MATH_CMP_HH +#endif // ! XTD_MATH_CMP_HH Index: xtd/mexpr.hh --- xtd/mexpr.hh (revision 587) +++ xtd/mexpr.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MEXPR_HH -# define EXTENDED_MEXPR_HH +#ifndef XTD_MEXPR_HH +# define XTD_MEXPR_HH # include <xtd/abstract/meta_nary_fun.hh> # include <xtd/abstract/fun_nary_expr.hh> @@ -484,4 +484,4 @@ -#endif // ! EXTENDED_MEXPR_HH +#endif // ! XTD_MEXPR_HH Index: xtd/cfun.hh --- xtd/cfun.hh (revision 587) +++ xtd/cfun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_CFUN_HH -# define EXTENDED_CFUN_HH +#ifndef XTD_CFUN_HH +# define XTD_CFUN_HH # include <xtd/abstract/plain_nary_fun.hh> # include <xtd/abstract/meta_nary_fun.hh> @@ -395,4 +395,4 @@ -#endif // ! EXTENDED_CFUN_HH +#endif // ! XTD_CFUN_HH Index: xtd/args.hh --- xtd/args.hh (revision 587) +++ xtd/args.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ARGS_HH -# define EXTENDED_ARGS_HH +#ifndef XTD_ARGS_HH +# define XTD_ARGS_HH # include <xtd/internal/mlc.hh> @@ -212,4 +212,4 @@ } // end of namespace xtd -#endif // ! EXTENDED_ARGS_HH +#endif // ! XTD_ARGS_HH Index: xtd/literal.hh --- xtd/literal.hh (revision 587) +++ xtd/literal.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_LITERAL_HH -# define EXTENDED_LITERAL_HH +#ifndef XTD_LITERAL_HH +# define XTD_LITERAL_HH # include <xtd/abstract/plain_nary_fun.hh> # include <xtd/abstract/meta_nary_fun.hh> @@ -176,4 +176,4 @@ -#endif // ! EXTENDED_LITERAL_HH +#endif // ! XTD_LITERAL_HH Index: xtd/optraits.hh --- xtd/optraits.hh (revision 587) +++ xtd/optraits.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_OPTRAITS_HH -# define EXTENDED_OPTRAITS_HH +#ifndef XTD_OPTRAITS_HH +# define XTD_OPTRAITS_HH # include <xtd/traits.hh> # include <xtd/builtin/traits.hh> @@ -251,4 +251,4 @@ -#endif // ! EXTENDED_OPTRAITS_HH +#endif // ! XTD_OPTRAITS_HH Index: xtd/abstract/nary_fun.hh --- xtd/abstract/nary_fun.hh (revision 587) +++ xtd/abstract/nary_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_NARY_FUN_HH -# define EXTENDED_ABSTRACT_NARY_FUN_HH +#ifndef XTD_ABSTRACT_NARY_FUN_HH +# define XTD_ABSTRACT_NARY_FUN_HH namespace xtd @@ -56,4 +56,4 @@ } // end of namespace xtd -#endif // ! EXTENDED_ABSTRACT_NARY_FUN_HH +#endif // ! XTD_ABSTRACT_NARY_FUN_HH Index: xtd/abstract/open_nary_fun.hh --- xtd/abstract/open_nary_fun.hh (revision 587) +++ xtd/abstract/open_nary_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_OPEN_NARY_FUN_HH -# define EXTENDED_ABSTRACT_OPEN_NARY_FUN_HH +#ifndef XTD_ABSTRACT_OPEN_NARY_FUN_HH +# define XTD_ABSTRACT_OPEN_NARY_FUN_HH # include <xtd/abstract/open_fun.hh> # include <xtd/abstract/nary_fun.hh> @@ -337,4 +337,4 @@ -#endif // ! EXTENDED_ABSTRACT_OPEN_NARY_FUN_HH +#endif // ! XTD_ABSTRACT_OPEN_NARY_FUN_HH Index: xtd/abstract/plain_nary_fun.hh --- xtd/abstract/plain_nary_fun.hh (revision 587) +++ xtd/abstract/plain_nary_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_PLAIN_NARY_FUN_HH -# define EXTENDED_ABSTRACT_PLAIN_NARY_FUN_HH +#ifndef XTD_ABSTRACT_PLAIN_NARY_FUN_HH +# define XTD_ABSTRACT_PLAIN_NARY_FUN_HH # include <xtd/abstract/plain_fun.hh> # include <xtd/abstract/nary_fun.hh> @@ -263,4 +263,4 @@ -#endif // ! EXTENDED_ABSTRACT_PLAIN_NARY_FUN_HH +#endif // ! XTD_ABSTRACT_PLAIN_NARY_FUN_HH Index: xtd/abstract/fun_expr.hh --- xtd/abstract/fun_expr.hh (revision 587) +++ xtd/abstract/fun_expr.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_FUN_EXPR_HH -# define EXTENDED_ABSTRACT_FUN_EXPR_HH +#ifndef XTD_ABSTRACT_FUN_EXPR_HH +# define XTD_ABSTRACT_FUN_EXPR_HH # include <xtd/abstract/fun.hh> # include <xtd/res.hh> @@ -86,4 +86,4 @@ -#endif // ! EXTENDED_ABSTRACT_FUN_EXPR_HH +#endif // ! XTD_ABSTRACT_FUN_EXPR_HH Index: xtd/abstract/meta_nary_fun.hh --- xtd/abstract/meta_nary_fun.hh (revision 587) +++ xtd/abstract/meta_nary_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_META_NARY_FUN_HH -# define EXTENDED_ABSTRACT_META_NARY_FUN_HH +#ifndef XTD_ABSTRACT_META_NARY_FUN_HH +# define XTD_ABSTRACT_META_NARY_FUN_HH # include <xtd/abstract/meta_fun.hh> # include <xtd/abstract/open_nary_fun.hh> @@ -140,4 +140,4 @@ -#endif // ! EXTENDED_ABSTRACT_META_NARY_FUN_HH +#endif // ! XTD_ABSTRACT_META_NARY_FUN_HH Index: xtd/abstract/fun.hh --- xtd/abstract/fun.hh (revision 587) +++ xtd/abstract/fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_FUN_HH -# define EXTENDED_ABSTRACT_FUN_HH +#ifndef XTD_ABSTRACT_FUN_HH +# define XTD_ABSTRACT_FUN_HH # include <xtd/internal/mlc.hh> @@ -101,4 +101,4 @@ -#endif // ! EXTENDED_ABSTRACT_FUN_HH +#endif // ! XTD_ABSTRACT_FUN_HH Index: xtd/abstract/open_fun.hh --- xtd/abstract/open_fun.hh (revision 587) +++ xtd/abstract/open_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_OPEN_FUN_HH -# define EXTENDED_ABSTRACT_OPEN_FUN_HH +#ifndef XTD_ABSTRACT_OPEN_FUN_HH +# define XTD_ABSTRACT_OPEN_FUN_HH # include <xtd/internal/mlc.hh> @@ -68,4 +68,4 @@ -#endif // ! EXTENDED_ABSTRACT_OPEN_FUN_HH +#endif // ! XTD_ABSTRACT_OPEN_FUN_HH Index: xtd/abstract/plain_fun.hh --- xtd/abstract/plain_fun.hh (revision 587) +++ xtd/abstract/plain_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_PLAIN_FUN_HH -# define EXTENDED_ABSTRACT_PLAIN_FUN_HH +#ifndef XTD_ABSTRACT_PLAIN_FUN_HH +# define XTD_ABSTRACT_PLAIN_FUN_HH # include <xtd/abstract/fun.hh> @@ -122,4 +122,4 @@ -#endif // ! EXTENDED_ABSTRACT_PLAIN_FUN_HH +#endif // ! XTD_ABSTRACT_PLAIN_FUN_HH Index: xtd/abstract/meta_fun.hh --- xtd/abstract/meta_fun.hh (revision 587) +++ xtd/abstract/meta_fun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_META_FUN_HH -# define EXTENDED_ABSTRACT_META_FUN_HH +#ifndef XTD_ABSTRACT_META_FUN_HH +# define XTD_ABSTRACT_META_FUN_HH # include <xtd/abstract/fun.hh> @@ -75,4 +75,4 @@ -#endif // ! EXTENDED_ABSTRACT_META_FUN_HH +#endif // ! XTD_ABSTRACT_META_FUN_HH Index: xtd/abstract/fun_nary_expr.hh --- xtd/abstract/fun_nary_expr.hh (revision 587) +++ xtd/abstract/fun_nary_expr.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ABSTRACT_FUN_NARY_EXPR_HH -# define EXTENDED_ABSTRACT_FUN_NARY_EXPR_HH +#ifndef XTD_ABSTRACT_FUN_NARY_EXPR_HH +# define XTD_ABSTRACT_FUN_NARY_EXPR_HH # include <xtd/abstract/fun_expr.hh> # include <xtd/abstract/open_nary_fun.hh> @@ -231,4 +231,4 @@ # include <xtd/bind.hh> -#endif // ! EXTENDED_ABSTRACT_FUN_NARY_EXPR_HH +#endif // ! XTD_ABSTRACT_FUN_NARY_EXPR_HH Index: xtd/mfun.hh --- xtd/mfun.hh (revision 587) +++ xtd/mfun.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_MFUN_HH -# define EXTENDED_MFUN_HH +#ifndef XTD_MFUN_HH +# define XTD_MFUN_HH # include <xtd/abstract/plain_fun.hh> # include <xtd/abstract/meta_nary_fun.hh> @@ -188,4 +188,4 @@ -#endif // ! EXTENDED_MFUN_HH +#endif // ! XTD_MFUN_HH Index: xtd/traits.hh --- xtd/traits.hh (revision 587) +++ xtd/traits.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_TRAITS_HH -# define EXTENDED_TRAITS_HH +#ifndef XTD_TRAITS_HH +# define XTD_TRAITS_HH # include <xtd/internal/mlc.hh> @@ -71,4 +71,4 @@ -#endif // ! EXTENDED_TRAITS_HH +#endif // ! XTD_TRAITS_HH Index: xtd/builtin/traits.hh --- xtd/builtin/traits.hh (revision 587) +++ xtd/builtin/traits.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_BUILTIN_TRAITS_HH -# define EXTENDED_BUILTIN_TRAITS_HH +#ifndef XTD_BUILTIN_TRAITS_HH +# define XTD_BUILTIN_TRAITS_HH # include <xtd/traits.hh> @@ -177,4 +177,4 @@ -#endif // ! EXTENDED_BUILTIN_TRAITS_HH +#endif // ! XTD_BUILTIN_TRAITS_HH Index: xtd/arg.hh --- xtd/arg.hh (revision 587) +++ xtd/arg.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_ARG_HH -# define EXTENDED_ARG_HH +#ifndef XTD_ARG_HH +# define XTD_ARG_HH # include <xtd/abstract/fun_nary_expr.hh> @@ -138,4 +138,4 @@ } // end of namespace xtd -#endif // ! EXTENDED_ARG_HH +#endif // ! XTD_ARG_HH Index: xtd/bind.hh --- xtd/bind.hh (revision 587) +++ xtd/bind.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_BIND_HH -# define EXTENDED_BIND_HH +#ifndef XTD_BIND_HH +# define XTD_BIND_HH # include <xtd/abstract/fun_nary_expr.hh> # include <xtd/literal.hh> @@ -102,4 +102,4 @@ -#endif // ! EXTENDED_BIND_HH +#endif // ! XTD_BIND_HH Index: xtd/vec.hh --- xtd/vec.hh (revision 587) +++ xtd/vec.hh (working copy) @@ -26,8 +26,8 @@ // Public License. -#ifndef EXTENDED_VEC_HH -# define EXTENDED_VEC_HH +#ifndef XTD_VEC_HH +# define XTD_VEC_HH # include <iostream> # include <mlc/contract.hh> @@ -345,4 +345,4 @@ } // end of namespace xtd -#endif // ! EXTENDED_VEC_HH +#endif // ! XTD_VEC_HH Index: xtd/internal/opmacros.hh --- xtd/internal/opmacros.hh (revision 587) +++ xtd/internal/opmacros.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_INTERNAL_OPMACROS_HH -# define EXTENDED_INTERNAL_OPMACROS_HH +#ifndef XTD_INTERNAL_OPMACROS_HH +# define XTD_INTERNAL_OPMACROS_HH # include <mlc/if.hh> # include <xtd/math/includes.hh> @@ -199,4 +199,4 @@ -#endif // ! EXTENDED_INTERNAL_OPMACROS_HH +#endif // ! XTD_INTERNAL_OPMACROS_HH Index: xtd/internal/mlc.hh --- xtd/internal/mlc.hh (revision 587) +++ xtd/internal/mlc.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef EXTENDED_INTERNAL_MLC_HH -# define EXTENDED_INTERNAL_MLC_HH +#ifndef XTD_INTERNAL_MLC_HH +# define XTD_INTERNAL_MLC_HH # include <mlc/flags.hh> # include <mlc/comma.hh> @@ -52,4 +52,4 @@ mlc_case_equipment_for_namespace(xtd); -#endif // ! EXTENDED_INTERNAL_MLC_HH +#endif // ! XTD_INTERNAL_MLC_HH

1 0

587: Adjust header guards to match the file name in Metalic.
by Roland Levillain 28 Sep '06

28 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/metalic Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mlc/abstract/type.hh, mlc/abstract/bexpr.hh, * mlc/abort.hh, mlc/assert.hh, mlc/bexpr.hh, mlc/bool.hh, * mlc/case.hh, mlc/char.hh, mlc/cmp.hh, mlc/comma.hh, * mlc/contract.hh, mlc/elt.hh, mlc/flags.hh, mlc/if.hh, * mlc/implies.hh, mlc/int.hh, mlc/is_a.hh, mlc/logic.hh, * mlc/pair.hh, mlc/ret.hh, mlc/switch.hh, mlc/to_string.hh, * mlc/typedef.hh, mlc/uint.hh, mlc/valist.hh, mlc/value.hh, * mlc/values.hh, mlc/wrap.hh: Adjust header guards to match the file name. abort.hh | 6 +++--- abstract/bexpr.hh | 6 +++--- abstract/type.hh | 6 +++--- assert.hh | 6 +++--- bexpr.hh | 6 +++--- bool.hh | 6 +++--- case.hh | 6 +++--- char.hh | 6 +++--- cmp.hh | 6 +++--- comma.hh | 6 +++--- contract.hh | 6 +++--- elt.hh | 6 +++--- flags.hh | 6 +++--- if.hh | 6 +++--- implies.hh | 6 +++--- int.hh | 6 +++--- is_a.hh | 6 +++--- logic.hh | 6 +++--- pair.hh | 6 +++--- ret.hh | 6 +++--- switch.hh | 6 +++--- to_string.hh | 6 +++--- typedef.hh | 6 +++--- uint.hh | 6 +++--- valist.hh | 6 +++--- value.hh | 6 +++--- values.hh | 6 +++--- wrap.hh | 6 +++--- 28 files changed, 84 insertions(+), 84 deletions(-) Index: mlc/elt.hh --- mlc/elt.hh (revision 586) +++ mlc/elt.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_ELT_HH -# define METALIC_ELT_HH +#ifndef MLC_ELT_HH +# define MLC_ELT_HH # define mlc_elt(Type, Index) typename Type::template elt< Index >::ret @@ -35,4 +35,4 @@ -#endif // ! METALIC_ELT_HH +#endif // ! MLC_ELT_HH Index: mlc/ret.hh --- mlc/ret.hh (revision 586) +++ mlc/ret.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_RET_HH -# define METALIC_RET_HH +#ifndef MLC_RET_HH +# define MLC_RET_HH # include <mlc/typedef.hh> # include <mlc/cmp.hh> @@ -79,4 +79,4 @@ -#endif // ! METALIC_RET_HH +#endif // ! MLC_RET_HH Index: mlc/int.hh --- mlc/int.hh (revision 586) +++ mlc/int.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_INT_HH -# define METALIC_INT_HH +#ifndef MLC_INT_HH +# define MLC_INT_HH # include <mlc/value.hh> @@ -85,4 +85,4 @@ -#endif // ! METALIC_INT_HH +#endif // ! MLC_INT_HH Index: mlc/pair.hh --- mlc/pair.hh (revision 586) +++ mlc/pair.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_PAIR_HH -# define METALIC_PAIR_HH +#ifndef MLC_PAIR_HH +# define MLC_PAIR_HH # include <mlc/assert.hh> # include <mlc/logic.hh> @@ -107,4 +107,4 @@ -#endif // ! METALIC_PAIR_HH +#endif // ! MLC_PAIR_HH Index: mlc/bool.hh --- mlc/bool.hh (revision 586) +++ mlc/bool.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_BOOL_HH -# define METALIC_BOOL_HH +#ifndef MLC_BOOL_HH +# define MLC_BOOL_HH # include <mlc/value.hh> # include <mlc/bexpr.hh> @@ -100,4 +100,4 @@ } // end of namespace mlc -#endif // ! METALIC_BOOL_HH +#endif // ! MLC_BOOL_HH Index: mlc/flags.hh --- mlc/flags.hh (revision 586) +++ mlc/flags.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_FLAGS_HH -# define METALIC_FLAGS_HH +#ifndef MLC_FLAGS_HH +# define MLC_FLAGS_HH # include <mlc/abstract/type.hh> @@ -213,4 +213,4 @@ } // end of namespace mlc -#endif // ! METALIC_FLAGS_HH +#endif // ! MLC_FLAGS_HH Index: mlc/comma.hh --- mlc/comma.hh (revision 586) +++ mlc/comma.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_COMMA_HH -# define METALIC_COMMA_HH +#ifndef MLC_COMMA_HH +# define MLC_COMMA_HH // FIXME: doc @@ -37,4 +37,4 @@ # define mlc_comma_4(a, b, c, d, e) a, b, c, d, e -#endif // ! METALIC_COMMA_HH +#endif // ! MLC_COMMA_HH Index: mlc/logic.hh --- mlc/logic.hh (revision 586) +++ mlc/logic.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_LOGIC_HH -# define METALIC_LOGIC_HH +#ifndef MLC_LOGIC_HH +# define MLC_LOGIC_HH # include <mlc/bexpr.hh> # include <mlc/assert.hh> @@ -432,4 +432,4 @@ } // end of namespace mlc -#endif // ! METALIC_LOGIC_HH +#endif // ! MLC_LOGIC_HH Index: mlc/if.hh --- mlc/if.hh (revision 586) +++ mlc/if.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_IF_HH -# define METALIC_IF_HH +#ifndef MLC_IF_HH +# define MLC_IF_HH # include <mlc/bexpr.hh> # include <mlc/assert.hh> @@ -108,4 +108,4 @@ } // end of namespace mlc -#endif // ! METALIC_IF_HH +#endif // ! MLC_IF_HH Index: mlc/values.hh --- mlc/values.hh (revision 586) +++ mlc/values.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_VALUES_HH -# define METALIC_VALUES_HH +#ifndef MLC_VALUES_HH +# define MLC_VALUES_HH @@ -46,4 +46,4 @@ -#endif // ! METALIC_VALUES_HH +#endif // ! MLC_VALUES_HH Index: mlc/typedef.hh --- mlc/typedef.hh (revision 586) +++ mlc/typedef.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_TYPEDEF_HH -# define METALIC_TYPEDEF_HH +#ifndef MLC_TYPEDEF_HH +# define MLC_TYPEDEF_HH # include <mlc/flags.hh> # include <mlc/bool.hh> @@ -278,4 +278,4 @@ typedef_::TypedefName::from_onlyif_< Type, mlc_bool(Bexpr) >::ret -#endif // ! METALIC_TYPEDEF_HH +#endif // ! MLC_TYPEDEF_HH Index: mlc/assert.hh --- mlc/assert.hh (revision 586) +++ mlc/assert.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_ASSERT_HH -# define METALIC_ASSERT_HH +#ifndef MLC_ASSERT_HH +# define MLC_ASSERT_HH # include <mlc/flags.hh> @@ -256,4 +256,4 @@ } // end of namespace mlc -#endif // ! METALIC_ASSERT_HH +#endif // ! MLC_ASSERT_HH Index: mlc/switch.hh --- mlc/switch.hh (revision 586) +++ mlc/switch.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_SWITCH_HH -# define METALIC_SWITCH_HH +#ifndef MLC_SWITCH_HH +# define MLC_SWITCH_HH # include <mlc/case.hh> @@ -44,4 +44,4 @@ /// \} -#endif // ! METALIC_SWITCH_HH +#endif // ! MLC_SWITCH_HH Index: mlc/valist.hh --- mlc/valist.hh (revision 586) +++ mlc/valist.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_VALIST_HH -# define METALIC_VALIST_HH +#ifndef MLC_VALIST_HH +# define MLC_VALIST_HH # include <mlc/assert.hh> # include <mlc/cmp.hh> @@ -181,4 +181,4 @@ -#endif // ! METALIC_VALIST_HH +#endif // ! MLC_VALIST_HH Index: mlc/implies.hh --- mlc/implies.hh (revision 586) +++ mlc/implies.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_IMPLIES_HH -# define METALIC_IMPLIES_HH +#ifndef MLC_IMPLIES_HH +# define MLC_IMPLIES_HH # include <mlc/bexpr.hh> # include <mlc/assert.hh> @@ -81,4 +81,4 @@ -#endif // ! METALIC_IMPLIES_HH +#endif // ! MLC_IMPLIES_HH Index: mlc/abstract/type.hh --- mlc/abstract/type.hh (revision 586) +++ mlc/abstract/type.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_ABSTRACT_TYPE_HH -# define METALIC_ABSTRACT_TYPE_HH +#ifndef MLC_ABSTRACT_TYPE_HH +# define MLC_ABSTRACT_TYPE_HH namespace mlc { @@ -58,4 +58,4 @@ } // end of namespace mlc -#endif // ! METALIC_ABSTRACT_TYPE_HH +#endif // ! MLC_ABSTRACT_TYPE_HH Index: mlc/abstract/bexpr.hh --- mlc/abstract/bexpr.hh (revision 586) +++ mlc/abstract/bexpr.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_ABSTRACT_BEXPR_HH -# define METALIC_ABSTRACT_BEXPR_HH +#ifndef MLC_ABSTRACT_BEXPR_HH +# define MLC_ABSTRACT_BEXPR_HH # include <mlc/abstract/type.hh> # include <mlc/flags.hh> @@ -62,4 +62,4 @@ -#endif // ! METALIC_ABSTRACT_BEXPR_HH +#endif // ! MLC_ABSTRACT_BEXPR_HH Index: mlc/abort.hh --- mlc/abort.hh (revision 586) +++ mlc/abort.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_ABORT_HH -# define METALIC_ABORT_HH +#ifndef MLC_ABORT_HH +# define MLC_ABORT_HH # include <mlc/bexpr.hh> # include <mlc/assert.hh> @@ -117,4 +117,4 @@ } // end of namespace mlc -#endif // ! METALIC_ABORT_HH +#endif // ! MLC_ABORT_HH Index: mlc/to_string.hh --- mlc/to_string.hh (revision 586) +++ mlc/to_string.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_TO_STRING_HH -# define METALIC_TO_STRING_HH +#ifndef MLC_TO_STRING_HH +# define MLC_TO_STRING_HH # include <iostream> # include <string> @@ -66,4 +66,4 @@ -#endif // ! METALIC_TO_STRING_HH +#endif // ! MLC_TO_STRING_HH Index: mlc/wrap.hh --- mlc/wrap.hh (revision 586) +++ mlc/wrap.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_WRAP_HH -# define METALIC_WRAP_HH +#ifndef MLC_WRAP_HH +# define MLC_WRAP_HH namespace mlc @@ -123,4 +123,4 @@ */ -#endif // ! METALIC_WRAP_HH +#endif // ! MLC_WRAP_HH Index: mlc/is_a.hh --- mlc/is_a.hh (revision 586) +++ mlc/is_a.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_IS_A_HH -# define METALIC_IS_A_HH +#ifndef MLC_IS_A_HH +# define MLC_IS_A_HH # include <mlc/bool.hh> # include <mlc/bexpr.hh> @@ -264,4 +264,4 @@ mlc::not_< mlc::is_a_< sizeof(mlc::form::of<U >())>::ret< T, U > > -#endif // ! METALIC_IS_A_HH +#endif // ! MLC_IS_A_HH Index: mlc/case.hh --- mlc/case.hh (revision 586) +++ mlc/case.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_CASE_HH -# define METALIC_CASE_HH +#ifndef MLC_CASE_HH +# define MLC_CASE_HH # include <mlc/bexpr.hh> # include <mlc/assert.hh> @@ -430,4 +430,4 @@ -#endif // ! METALIC_CASE_HH +#endif // ! MLC_CASE_HH Index: mlc/value.hh --- mlc/value.hh (revision 586) +++ mlc/value.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_VALUE_HH -# define METALIC_VALUE_HH +#ifndef MLC_VALUE_HH +# define MLC_VALUE_HH # include <mlc/abstract/type.hh> // # include <mlc/assert.hh> @@ -90,4 +90,4 @@ -#endif // ! METALIC_VALUE_HH +#endif // ! MLC_VALUE_HH Index: mlc/char.hh --- mlc/char.hh (revision 586) +++ mlc/char.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_CHAR_HH -# define METALIC_CHAR_HH +#ifndef MLC_CHAR_HH +# define MLC_CHAR_HH # include <mlc/value.hh> @@ -48,4 +48,4 @@ } // end of namespace mlc -#endif // ! METALIC_CHAR_HH +#endif // ! MLC_CHAR_HH Index: mlc/contract.hh --- mlc/contract.hh (revision 586) +++ mlc/contract.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_CONTRACT_HH -# define METALIC_CONTRACT_HH +#ifndef MLC_CONTRACT_HH +# define MLC_CONTRACT_HH # include <cassert> @@ -60,4 +60,4 @@ } \ struct e_n_d__w_i_t_h__s_e_m_i_c_o_l_o_n -#endif // ! METALIC_CONTRACT_HH +#endif // ! MLC_CONTRACT_HH Index: mlc/uint.hh --- mlc/uint.hh (revision 586) +++ mlc/uint.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_UINT_HH -# define METALIC_UINT_HH +#ifndef MLC_UINT_HH +# define MLC_UINT_HH # include <mlc/bool.hh> @@ -65,4 +65,4 @@ -#endif // ! METALIC_UINT_HH +#endif // ! MLC_UINT_HH Index: mlc/cmp.hh --- mlc/cmp.hh (revision 586) +++ mlc/cmp.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_CMP_HH -# define METALIC_CMP_HH +#ifndef MLC_CMP_HH +# define MLC_CMP_HH # include <mlc/bexpr.hh> # include <mlc/is_a.hh> @@ -249,4 +249,4 @@ } // end of namespace mlc -#endif // ! METALIC_CMP_HH +#endif // ! MLC_CMP_HH Index: mlc/bexpr.hh --- mlc/bexpr.hh (revision 586) +++ mlc/bexpr.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef METALIC_BEXPR_HH -# define METALIC_BEXPR_HH +#ifndef MLC_BEXPR_HH +# define MLC_BEXPR_HH # include <mlc/abstract/bexpr.hh> # include <mlc/flags.hh> @@ -157,4 +157,4 @@ -#endif // ! METALIC_BEXPR_HH +#endif // ! MLC_BEXPR_HH

1 0

586: Adjust header guards to match the file name in Static.
by Roland Levillain 28 Sep '06

28 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * stc/any.hh, stc/entry.hh, stc/exact.hh, stc/find_exact.hh, * stc/scoop.hh, stc/valist_aggregator.hh, * stc/internal/extract_vtype_from_list.hh: Adjust header guards to match the file name. any.hh | 6 +++--- entry.hh | 6 +++--- exact.hh | 6 +++--- find_exact.hh | 6 +++--- internal/extract_vtype_from_list.hh | 6 +++--- scoop.hh | 6 +++--- valist_aggregator.hh | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) Index: stc/entry.hh --- stc/entry.hh (revision 585) +++ stc/entry.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef STATIC_ENTRY_HH -# define STATIC_ENTRY_HH +#ifndef STC_ENTRY_HH +# define STC_ENTRY_HH /** \file stc/entry.hh \brief Extensible entry points in a class hierarchy. @@ -147,4 +147,4 @@ } // end of namespace stc -#endif // ! STATIC_ENTRY_HH +#endif // ! STC_ENTRY_HH Index: stc/scoop.hh --- stc/scoop.hh (revision 585) +++ stc/scoop.hh (working copy) @@ -32,8 +32,8 @@ Based on Theo's presentation from January 2006 (olena-06-jan.pdf). */ -#ifndef STATIC_SCOOP_HH -# define STATIC_SCOOP_HH +#ifndef STC_SCOOP_HH +# define STC_SCOOP_HH # include <mlc/flags.hh> # include <mlc/typedef.hh> @@ -1035,4 +1035,4 @@ typedef oln_check_type_of(E, Typedef) Typedef -#endif // ! STATIC_SCOOP_HH +#endif // ! STC_SCOOP_HH Index: stc/exact.hh --- stc/exact.hh (revision 585) +++ stc/exact.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef STATIC_EXACT_HH -# define STATIC_EXACT_HH +#ifndef STC_EXACT_HH +# define STC_EXACT_HH # include <stc/any.hh> @@ -198,4 +198,4 @@ } // end of namespace stc -#endif // ! STATIC_EXACT_HH +#endif // ! STC_EXACT_HH Index: stc/valist_aggregator.hh --- stc/valist_aggregator.hh (revision 585) +++ stc/valist_aggregator.hh (working copy) @@ -31,8 +31,8 @@ /// Converts a mlc::valist_ into a class inheriting from all the /// elements of the list. -#ifndef STATIC_VALIST_AGGREGATOR_HH -# define STATIC_VALIST_AGGREGATOR_HH +#ifndef STC_VALIST_AGGREGATOR_HH +# define STC_VALIST_AGGREGATOR_HH // FIXME: To be moved in Metalic? @@ -140,4 +140,4 @@ } // end of namespace stc -#endif // ! STATIC_VALIST_AGGREGATOR_HH +#endif // ! STC_VALIST_AGGREGATOR_HH Index: stc/find_exact.hh --- stc/find_exact.hh (revision 585) +++ stc/find_exact.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef STATIC_FIND_EXACT_HH -# define STATIC_FIND_EXACT_HH +#ifndef STC_FIND_EXACT_HH +# define STC_FIND_EXACT_HH # define stc_find_exact(Abstraction, ExactType) \ typename stc::find_exact< Abstraction, ExactType >::ret @@ -56,4 +56,4 @@ } // end of namespace stc -#endif // ! STATIC_FIND_EXACT_HH +#endif // ! STC_FIND_EXACT_HH Index: stc/any.hh --- stc/any.hh (revision 585) +++ stc/any.hh (working copy) @@ -27,8 +27,8 @@ // Public License. -#ifndef STATIC_ANY_HH -# define STATIC_ANY_HH +#ifndef STC_ANY_HH +# define STC_ANY_HH /// \file stc/any.hh /// \brief Implementation of stc::any classes (top of static hierachies). @@ -218,4 +218,4 @@ } // end of namespace stc -#endif // ! STATIC_ANY_HH +#endif // ! STC_ANY_HH Index: stc/internal/extract_vtype_from_list.hh --- stc/internal/extract_vtype_from_list.hh (revision 585) +++ stc/internal/extract_vtype_from_list.hh (working copy) @@ -33,8 +33,8 @@ This file is part of the rec_get_vtype_from_list from stc/vtypes.hh. */ -#ifndef STATIC_INTERNAL_EXTRACT_VTYPE_FROM_LIST -# define STATIC_INTERNAL_EXTRACT_VTYPE_FROM_LIST +#ifndef STC_INTERNAL_EXTRACT_VTYPE_FROM_LIST_HH +# define STC_INTERNAL_EXTRACT_VTYPE_FROM_LIST_HH # include <mlc/flags.hh> # include <mlc/valist.hh> @@ -155,4 +155,4 @@ } // end of namespace stc -#endif // ! STATIC_INTERNAL_EXTRACT_VTYPE_FROM_LIST +#endif // ! STC_INTERNAL_EXTRACT_VTYPE_FROM_LIST_HH

1 0

585: Add oln::level::fill().
by Roland Levillain 28 Sep '06

28 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add oln::level::fill(). * oln/level/fill.hh: New. * oln/Makefile.am (nobase_oln_HEADERS): Add level/fill.hh. * tests/fill.cc: New test. * tests/Makefile.am (AM_CXXFLAGS): Rename as... (CXXFLAGS): ...this. (check_PROGRAMS): Add fill. (fill_SOURCES): New. oln/Makefile.am | 2 + oln/level/fill.hh | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 16 +++++++-- tests/fill.cc | 46 +++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 3 deletions(-) Index: tests/Makefile.am --- tests/Makefile.am (revision 584) +++ tests/Makefile.am (working copy) @@ -3,12 +3,14 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ -I$(top_srcdir)/static -I$(top_srcdir)/metalic + # FIXME: Add # -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) -ggdb +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # # when oln.m4 is available in the distribution. -AM_CXXFLAGS = -O0 -ggdb +# Meanwhile, alter CXXFLAGS to turn off any optimization. +CXXFLAGS = -O0 -ggdb check_PROGRAMS = \ @@ -18,14 +20,22 @@ \ identity_morpher \ add_neighborhood_morpher \ - morphers + morphers \ + \ + fill +# Images and auxiliary structures. grid_SOURCES = grid.cc image_entry_SOURCES = image_entry.cc npoints_SOURCES = npoints.cc + # Morphers. identity_morpher_SOURCES = identity_morpher.cc add_neighborhood_morpher_SOURCES = add_neighborhood_morpher.cc morphers_SOURCES = morphers.cc +# Algorithms. +fill_SOURCES = fill.cc + + TESTS = $(check_PROGRAMS) Index: tests/fill.cc --- tests/fill.cc (revision 0) +++ tests/fill.cc (revision 0) @@ -0,0 +1,46 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// Test oln::level::fill. + +#include <cassert> +// FIXME: We should not include oln/basics2d.hh, but +// oln/core/2d/image2d.hh (and oln/core/2d/neigh2d.hh ?). +#include <oln/basics2d.hh> +#include <oln/level/fill.hh> + + +int +main() +{ + typedef oln::image2d<int> image_t; + image_t ima(3, 3); + oln::level::fill(ima, 51); + oln_type_of_(image_t, piter) p(ima.topo()); + for_all(p) + assert(ima(p) == 51); +} Index: oln/level/fill.hh --- oln/level/fill.hh (revision 0) +++ oln/level/fill.hh (revision 0) @@ -0,0 +1,89 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 EPITA Research and +// Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_LEVEL_FILL_HH +# define OLN_LEVEL_FILL_HH + +# include <mlc/assert.hh> +# include <mlc/is_a.hh> + +# include <oln/core/abstract/image.hh> +# include <oln/core/automatic/image_being_mutable.hh> + + +namespace oln +{ + + namespace ERROR + { + struct FIRST_ARGUMENT_OF_oln_level_fill_IS_NOT_MUTABLE; + } + + namespace level + { + + /// Fwd decl. + template <typename I> + void fill(abstract::image<I>& input, const oln_type_of(I, value)& val); + + + namespace impl + { + + /// Generic version. + template <typename I> + void fill(abstract::image_being_mutable<I>& input, + const oln_type_of(I, value)& val) + { + oln_type_of(I, piter) p(input.topo()); + for_all(p) + input(p) = val; + } + + } // end of namespace oln::level::fill + + + /// Facade. + template <typename I> + void fill(abstract::image<I>& input, const oln_type_of(I, value)& val) + { + // Precondition. + mlc::assert_< + mlc_is_a(I, abstract::image_being_mutable), + ERROR::FIRST_ARGUMENT_OF_oln_level_fill_IS_NOT_MUTABLE + >::check(); + + impl::fill(input.exact(), val); + } + + } // end of namespace oln::level + +} // end of namespace oln + + +#endif // ! OLN_LEVEL_FILL_HH Index: oln/Makefile.am --- oln/Makefile.am (revision 584) +++ oln/Makefile.am (working copy) @@ -112,6 +112,8 @@ \ debug/print.hh \ \ + level/fill.hh \ + \ morpher/internal/image_extension.hh \ \ morpher/add_neighborhood.hh \

1 0

584: Catch up with Static's changes on automatically retrieved implementations.
by Roland Levillain 28 Sep '06

28 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Catch up with Static's changes on automatically retrieved implementations. * oln/core/automatic/impl.hh: New. * oln/automatic/image.hh: Move... * oln/core/automatic/image.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/image_being_mutable.hh: Move... * oln/core/automatic/image_being_mutable.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/image_being_random_accessible.hh: Move... * oln/core/automatic/image_being_random_accessible.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/image_having_neighborhood.hh: Move... * oln/core/automatic/image_having_neighborhood.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/topology_being_random_accessible.hh: Move... * oln/core/automatic/topology_being_random_accessible.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/topology_having_bbox.hh: Move... * oln/core/automatic/topology_having_bbox.hh: ...here. (impl): Rename as... (set_impl): ...this. * oln/automatic/topology_having_neighborhood.hh: Move... * oln/core/automatic/topology_having_neighborhood.hh: ...here. (impl): Rename as... (set_impl): ...this. Adjust. * oln/core/abstract/image.hh (oln::abstract::image) * oln/core/abstract/image/accessibility/hierarchy.hh (oln::abstract::image_being_random_accessible) * oln/core/abstract/image/bbox/hierarchy.hh (oln::abstract::image_having_bbox) * oln/core/abstract/image/dimension/1d.hh (oln::abstract::image1d) * oln/core/abstract/image/dimension/2d.hh (oln::abstract::image2d) * oln/core/abstract/image/dimension/3d.hh (oln::abstract::image3d) * oln/core/abstract/image/mutability/hierarchy.hh (oln::abstract::image_being_mutable) * oln/core/abstract/image/neighborhood/hierarchy.hh (oln::abstract::image_having_neighborhood) * oln/core/abstract/topology_being_random_accessible.hh (oln::abstract::topology_being_random_accessible) * oln/core/abstract/topology_having_bbox.hh (oln::abstract::topology_having_bbox) * oln/core/abstract/topology_having_neighborhood.hh (oln::abstract::topology_having_neighborhood): Adjust. * oln/Makefile.am (nobase_oln_HEADERS): Adjust. Makefile.am | 39 ++++++++++---- core/abstract/image.hh | 4 - core/abstract/image/accessibility/hierarchy.hh | 5 - core/abstract/image/bbox/hierarchy.hh | 3 - core/abstract/image/dimension/1d.hh | 3 - core/abstract/image/dimension/2d.hh | 2 core/abstract/image/dimension/3d.hh | 2 core/abstract/image/mutability/hierarchy.hh | 6 -- core/abstract/image/neighborhood/hierarchy.hh | 8 --- core/abstract/topology_being_random_accessible.hh | 8 --- core/abstract/topology_having_bbox.hh | 7 -- core/abstract/topology_having_neighborhood.hh | 7 -- core/automatic/image.hh | 12 +--- core/automatic/image_being_mutable.hh | 10 +-- core/automatic/image_being_random_accessible.hh | 14 +++-- core/automatic/image_having_neighborhood.hh | 10 +-- core/automatic/impl.hh | 55 +++++++++++++++++++++ core/automatic/topology_being_random_accessible.hh | 13 ++-- core/automatic/topology_having_bbox.hh | 10 +-- core/automatic/topology_having_neighborhood.hh | 10 +-- 20 files changed, 141 insertions(+), 87 deletions(-) Index: oln/core/automatic/impl.hh --- oln/core/automatic/impl.hh (revision 0) +++ oln/core/automatic/impl.hh (revision 0) @@ -0,0 +1,55 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_AUTOMATIC_IMPL_HH +# define OLN_CORE_AUTOMATIC_IMPL_HH + +# include <oln/core/typedefs.hh> + + +namespace oln +{ + namespace automatic + { + /* Specialize to set an automatic implementation. */ + template <template <class> class abstraction, typename tag, typename E> + class set_impl + { + }; + + /// Specialization of oln::automatic::get_impl saving the user + /// the need to specify the morpher type as tag. + template < template <class> class abstraction, typename E > + class get_impl : public set_impl< abstraction, oln_type_of(E, morpher), E > + { + }; + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLN_CORE_AUTOMATIC_IMPL_HH Index: oln/core/automatic/image.hh --- oln/core/automatic/image.hh (revision 583) +++ oln/core/automatic/image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_IMAGE_HH -# define OLN_AUTOMATIC_IMAGE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -48,9 +48,7 @@ /// Implementation corresponding to the interface /// oln::abstract::image for an identity morpher. template <typename E> - class impl< abstract::image, - morpher::tag::identity, - E> : + class set_impl<abstract::image, morpher::tag::identity, E> : public virtual stc::any__simple<E> { private: @@ -79,4 +77,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_IMAGE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_HH Index: oln/core/automatic/topology_having_bbox.hh --- oln/core/automatic/topology_having_bbox.hh (revision 583) +++ oln/core/automatic/topology_having_bbox.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH -# define OLN_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -50,7 +50,7 @@ /// oln::abstract::topology_having_bbox for an identity morpher. template <typename E> - class impl< abstract::topology_having_bbox, + class set_impl< abstract::topology_having_bbox, morpher::tag::identity, E> : public virtual stc::any__simple<E> @@ -71,4 +71,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH Index: oln/core/automatic/image_being_random_accessible.hh --- oln/core/automatic/image_being_random_accessible.hh (revision 583) +++ oln/core/automatic/image_being_random_accessible.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -50,7 +50,7 @@ /// oln::abstract::image_being_random_accessible. template <typename E, typename M> - class impl< abstract::image_being_random_accessible, M, E> : + class set_impl<abstract::image_being_random_accessible, M, E> : public virtual stc::any__simple<E> { private: @@ -76,7 +76,9 @@ /// oln::abstract::image_being_random_accessible for an identity morpher. template <typename E> - class impl< abstract::image_being_random_accessible, morpher::tag::identity, E> : + class set_impl< abstract::image_being_random_accessible, + morpher::tag::identity, + E > : public virtual stc::any__simple<E> { private: @@ -101,4 +103,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/automatic/image_having_neighborhood.hh --- oln/core/automatic/image_having_neighborhood.hh (revision 583) +++ oln/core/automatic/image_having_neighborhood.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH -# define OLN_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +# define OLN_CORE_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -47,7 +47,7 @@ /// Implementation corresponding to the interface /// oln::abstract::image_having_neighborhood for an identity morpher. template <typename E> - class impl< abstract::image_having_neighborhood, + class set_impl< abstract::image_having_neighborhood, morpher::tag::identity, E> : public virtual stc::any__simple<E> @@ -67,4 +67,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH Index: oln/core/automatic/topology_being_random_accessible.hh --- oln/core/automatic/topology_being_random_accessible.hh (revision 583) +++ oln/core/automatic/topology_being_random_accessible.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -47,10 +47,11 @@ { /// Implementation corresponding to the interface - /// oln::abstract::topology_being_random_accessible for an identity morpher. + /// oln::abstract::topology_being_random_accessible for an identity + /// morpher. template <typename E> - class impl< abstract::topology_being_random_accessible, + class set_impl< abstract::topology_being_random_accessible, morpher::tag::identity, E> : public virtual stc::any__simple<E> @@ -76,4 +77,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/automatic/topology_having_neighborhood.hh --- oln/core/automatic/topology_having_neighborhood.hh (revision 583) +++ oln/core/automatic/topology_having_neighborhood.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH -# define OLN_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -50,7 +50,7 @@ /// oln::abstract::topology_having_neighborhood for an identity morpher. template <typename E> - class impl< abstract::topology_having_neighborhood, + class set_impl< abstract::topology_having_neighborhood, morpher::tag::identity, E> : public virtual stc::any__simple<E> @@ -71,4 +71,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/core/automatic/image_being_mutable.hh --- oln/core/automatic/image_being_mutable.hh (revision 583) +++ oln/core/automatic/image_being_mutable.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_AUTOMATIC_IMAGE_BEING_MUTABLE_HH -# define OLN_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_BEING_MUTABLE_HH -# include <oln/core/typedefs.hh> +# include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -47,7 +47,7 @@ /// Implementation corresponding to the interface /// oln::abstract::image_being_mutable for an identity morpher. template <typename E> - class impl< abstract::image_being_mutable, morpher::tag::identity, E> : + class set_impl<abstract::image_being_mutable, morpher::tag::identity, E> : public virtual stc::any__simple<E> { private: @@ -66,4 +66,4 @@ } // end of namespace oln -#endif // ! OLN_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_BEING_MUTABLE_HH Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 583) +++ oln/core/abstract/image.hh (working copy) @@ -31,7 +31,7 @@ # include <oln/core/typedefs.hh> # include <oln/core/abstract/fwd_decls.hh> -# include <oln/automatic/image.hh> +# include <oln/core/automatic/image.hh> namespace oln @@ -56,7 +56,7 @@ template <typename E> struct image : public virtual stc::any__simple<E>, public virtual oln::type, - public automatic::impl< image, oln_type_of(E, morpher), E > + public automatic::get_impl<image, E> { public: Index: oln/core/abstract/topology_having_bbox.hh --- oln/core/abstract/topology_having_bbox.hh (revision 583) +++ oln/core/abstract/topology_having_bbox.hh (working copy) @@ -29,7 +29,7 @@ # define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH # include <oln/core/abstract/topology.hh> -# include <oln/automatic/topology_having_bbox.hh> +# include <oln/core/automatic/topology_having_bbox.hh> namespace oln @@ -38,13 +38,10 @@ namespace abstract { - template <typename E> class topology_having_bbox : public virtual topology<E>, - public automatic::impl< topology_having_bbox, - oln_type_of(E, morpher), - E > + public automatic::get_impl<topology_having_bbox, E> { typedef oln_type_of(E, bbox) bbox_t; Index: oln/core/abstract/image/mutability/hierarchy.hh --- oln/core/abstract/image/mutability/hierarchy.hh (revision 583) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -29,9 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> - -// Automatically-inherited implementations. -# include <oln/automatic/image_being_mutable.hh> +# include <oln/core/automatic/image_being_mutable.hh> @@ -49,7 +47,7 @@ template <typename E> struct image_being_mutable : public virtual image<E>, - public automatic::impl< image_being_mutable, oln_type_of(E, morpher), E > + public automatic::get_impl<image_being_mutable, E> { private: Index: oln/core/abstract/image/dimension/1d.hh --- oln/core/abstract/image/dimension/1d.hh (revision 583) +++ oln/core/abstract/image/dimension/1d.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/abstract/image.hh> + namespace oln { @@ -40,7 +41,7 @@ template <typename E> struct image1d : public virtual image<E>, - public automatic::impl< image1d, oln_type_of(E, morpher), E> + public automatic::get_impl<image1d, E> { protected: /// Constructor (protected, empty). Index: oln/core/abstract/image/dimension/2d.hh --- oln/core/abstract/image/dimension/2d.hh (revision 583) +++ oln/core/abstract/image/dimension/2d.hh (working copy) @@ -41,7 +41,7 @@ template <typename E> struct image2d : public virtual image<E>, - public automatic::impl< image2d, oln_type_of(E, morpher), E> + public automatic::get_impl<image2d, E> { protected: /// Constructor (protected, empty). Index: oln/core/abstract/image/dimension/3d.hh --- oln/core/abstract/image/dimension/3d.hh (revision 583) +++ oln/core/abstract/image/dimension/3d.hh (working copy) @@ -41,7 +41,7 @@ template <typename E> struct image3d : public virtual image<E>, - public automatic::impl< image3d, oln_type_of(E, morpher), E> + public automatic::get_impl<image3d, E> { protected: /// Constructor (protected, empty). Index: oln/core/abstract/image/neighborhood/hierarchy.hh --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 583) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -29,9 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH # include <oln/core/abstract/image.hh> - -// Automatically-inherited implementations. -# include <oln/automatic/image_having_neighborhood.hh> +# include <oln/core/automatic/image_having_neighborhood.hh> /* Image having neighborhood hierarchy (summary). @@ -59,9 +57,7 @@ template <typename E> struct image_having_neighborhood : public virtual image<E>, - public automatic::impl< image_having_neighborhood, - oln_type_of(E, morpher), - E > + public automatic::get_impl<image_having_neighborhood, E> { private: typedef oln_type_of(E, neighborhood) neighborhood_t; Index: oln/core/abstract/image/accessibility/hierarchy.hh --- oln/core/abstract/image/accessibility/hierarchy.hh (revision 583) +++ oln/core/abstract/image/accessibility/hierarchy.hh (working copy) @@ -29,8 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> -# include <oln/automatic/image_being_random_accessible.hh> - +# include <oln/core/automatic/image_being_random_accessible.hh> namespace oln @@ -47,7 +46,7 @@ template <typename E> struct image_being_random_accessible : public virtual image<E>, - public automatic::impl< image_being_random_accessible, oln_type_of(E, morpher), E > + public automatic::get_impl< image_being_random_accessible, E > { typedef oln_type_of(E, point) point_t; Index: oln/core/abstract/image/bbox/hierarchy.hh --- oln/core/abstract/image/bbox/hierarchy.hh (revision 583) +++ oln/core/abstract/image/bbox/hierarchy.hh (working copy) @@ -32,7 +32,6 @@ # include <oln/core/abstract/bbox.hh> - namespace oln { @@ -47,7 +46,7 @@ template <typename E> struct image_having_bbox : public virtual image<E>, - public automatic::impl< image_having_bbox, oln_type_of(E, morpher), E > + public automatic::get_impl<image_having_bbox, E> { private: Index: oln/core/abstract/topology_being_random_accessible.hh --- oln/core/abstract/topology_being_random_accessible.hh (revision 583) +++ oln/core/abstract/topology_being_random_accessible.hh (working copy) @@ -29,8 +29,7 @@ # define OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/abstract/topology.hh> -# include <oln/automatic/topology_being_random_accessible.hh> - +# include <oln/core/automatic/topology_being_random_accessible.hh> namespace oln @@ -39,13 +38,10 @@ namespace abstract { - template <typename E> class topology_being_random_accessible : public virtual topology<E>, - public automatic::impl< topology_being_random_accessible, - oln_type_of(E, morpher), - E > + public automatic::get_impl<topology_being_random_accessible, E> { typedef oln_type_of(E, point) point_t; Index: oln/core/abstract/topology_having_neighborhood.hh --- oln/core/abstract/topology_having_neighborhood.hh (revision 583) +++ oln/core/abstract/topology_having_neighborhood.hh (working copy) @@ -29,7 +29,7 @@ # define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH # include <oln/core/abstract/topology.hh> -# include <oln/automatic/topology_having_neighborhood.hh> +# include <oln/core/automatic/topology_having_neighborhood.hh> namespace oln @@ -38,13 +38,10 @@ namespace abstract { - template <typename E> class topology_having_neighborhood : public virtual topology<E>, - public automatic::impl< topology_having_neighborhood, - oln_type_of(E, morpher), - E > + public automatic::get_impl<topology_having_neighborhood, E> { typedef oln_type_of(E, neighborhood) neighborhood_t; Index: oln/Makefile.am --- oln/Makefile.am (revision 583) +++ oln/Makefile.am (working copy) @@ -1,18 +1,8 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- olndir = $(includedir)/oln - nobase_oln_HEADERS = \ \ - automatic/image.hh \ - automatic/image_being_mutable.hh \ - automatic/image_being_random_accessible.hh \ - automatic/image_having_neighborhood.hh \ - automatic/image_having_neighborhood.hh \ - automatic/topology_being_random_accessible.hh \ - automatic/topology_having_bbox.hh \ - automatic/topology_having_neighborhood.hh \ - \ core/1d/grid1d.hh \ \ core/2d/aliases.hh \ @@ -25,7 +15,7 @@ \ core/3d/grid3d.hh \ \ - core/abstract/internal/image_impl.hh \ + core/abstract/image/accessibility/hierarchy.hh \ \ core/abstract/any.hh \ core/abstract/bbox.hh \ @@ -35,15 +25,19 @@ core/abstract/grid.hh \ core/abstract/image.hh \ core/abstract/image/accessibility/hierarchy.hh \ + \ core/abstract/image/bbox/hierarchy.hh \ + \ core/abstract/image/dimension/1d.hh \ core/abstract/image/dimension/2d.hh \ core/abstract/image/dimension/3d.hh \ core/abstract/image/dimension/hierarchy.hh \ - core/abstract/image/hierarchies.hh \ + \ core/abstract/image/hybrid/classical.hh \ core/abstract/image/mutability/hierarchy.hh \ + \ core/abstract/image/neighborhood/hierarchy.hh \ + \ core/abstract/image/type/binary.hh \ core/abstract/image/type/color.hh \ core/abstract/image/type/data.hh \ @@ -51,6 +45,17 @@ core/abstract/image/type/hierarchy.hh \ core/abstract/image/type/integre.hh \ core/abstract/image/type/label.hh \ + \ + core/abstract/image/hierarchies.hh \ + \ + core/abstract/internal/image_impl.hh \ + \ + core/abstract/any.hh \ + core/abstract/bbox.hh \ + core/abstract/dpoint.hh \ + core/abstract/entry.hh \ + core/abstract/grid.hh \ + core/abstract/image.hh \ core/abstract/iterator.hh \ core/abstract/iterator_on_points.hh \ core/abstract/neighborhood.hh \ @@ -67,6 +72,16 @@ core/abstract/topology_having_neighborhood.hh \ core/abstract/topology_hierarchies.hh \ \ + core/automatic/image.hh \ + core/automatic/image_being_mutable.hh \ + core/automatic/image_being_random_accessible.hh \ + core/automatic/image_having_neighborhood.hh \ + core/automatic/image_having_neighborhood.hh \ + core/automatic/impl.hh \ + core/automatic/topology_being_random_accessible.hh \ + core/automatic/topology_having_bbox.hh \ + core/automatic/topology_having_neighborhood.hh \ + \ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \ core/gen/bbox_fwd_piter.hh \

1 0

583: Get rid of the handling of automatically retrieved implementations.
by Roland Levillain 28 Sep '06

28 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Get rid of the handling of automatically retrieved implementations. * stc/scoop.hh (automatic::impl): Remove. The handling of automatically retrieved implementations is now the responsibility of the ``client'' (here, Olena). scoop.hh | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) Index: stc/scoop.hh --- stc/scoop.hh (revision 582) +++ stc/scoop.hh (working copy) @@ -243,21 +243,6 @@ }; \ \ \ - /* ----------------------------------------- */ \ - /* Automatically retrieved implementations. */ \ - /* ----------------------------------------- */ \ - \ - /** Default (empty) automatic implementation. */ \ - namespace automatic { \ - \ - template <template <class> class abstraction, typename E, typename tag> \ - class impl \ - { \ - }; \ - \ - } /* end of namespace SCOOPED_NAMESPACE ::automatic */ \ - \ - \ /* --------------- */ \ /* Virtual types. */ \ /* --------------- */ \ @@ -901,6 +886,7 @@ { \ typedef Super ret; \ }; \ + \ struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n // Shortcut. @@ -959,6 +945,7 @@ { \ typedef PseudoSuper ret; \ }; \ + \ struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n

1 0

582: Add oln debug print and a "classical" image abstraction.
by Thierry GERAUD 27 Sep '06

27 Sep '06

2006-09-27 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add oln debug print and a "classical" image abstraction. * oln/debug/print.hh: New. * oln/core/abstract/image/hybrid/classical.hh: New. * oln/core/abstract/image/hierarchies.hh (image_hybrid_hierarchy_wrt_classical): New. (include): Update. * oln/Makefile.am (nobase_oln_HEADERS): Update. Index: oln/debug/print.hh =================================================================== --- oln/debug/print.hh (revision 0) +++ oln/debug/print.hh (revision 0) @@ -0,0 +1,96 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_DEBUG_PRINT_HH +# define OLN_DEBUG_PRINT_HH + +# include <iostream> +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + + namespace debug + { + + /// Fwd decl. + template <typename I> + void print(const abstract::image<I>& input, std::ostream& ostr); + + + namespace impl + { + + /// Generic version. + template <typename I> + void print(const abstract::image<I>& input, std::ostream& ostr) + { + oln_type_of(I, fwd_piter) p(input.topo()); + for_all(p) + ostr << p.to_point() << ':' << ima(p) << ' '; + } + + + /// Version for classical 2D images. + template <typename I> + void print(const abstract::classical_2d_image<I>& input, + std::ostream& ostr) + { + for (int row = input.pmin().row(); row <= input.pmax().row(); ++row) + { + for (int col = input.pmin().col(); col <= input.pmax().col(); ++col) + { + point2d p(row, col); + if (input.has(p)) + ostr << input(p); + else + ostr << '-'; + ostr << ' '; + } + ostr << std::endl; + } + } + + } // end of namespace oln::debug::impl + + + /// Facade. + template <typename I> + void print(const abstract::image<I>& input, std::ostream& ostr) + { + impl::print(input.exact(), ostr); + } + + + } // end of namespace oln::debug + +} // end of namespace oln + + +#endif // ! OLN_DEBUG_PRINT_HH Index: oln/core/abstract/image/hybrid/classical.hh =================================================================== --- oln/core/abstract/image/hybrid/classical.hh (revision 0) +++ oln/core/abstract/image/hybrid/classical.hh (revision 0) @@ -0,0 +1,95 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_ABSTRACT_IMAGE_HYBRID_CLASSICAL_HH +# define OLN_CORE_ABSTRACT_IMAGE_HYBRID_CLASSICAL_HH + +# include <oln/core/abstract/image.hh> + +# include <oln/core/abstract/image/dimension/2d.hh> +# include <oln/core/abstract/image/bbox/hierarchy.hh> +# include <oln/core/abstract/image/accessibility/hierarchy.hh> + + +namespace oln +{ + + namespace abstract + { + + template <typename E> + struct classical_image + : public virtual abstract::image_having_bbox<E>, + public virtual abstract::image_being_random_accessible<E> + { + protected: + classical_image() + {} + }; + + template <typename E> + struct classical_2d_image + : public virtual abstract::classical_image<E>, + public virtual abstract::image2d<E> + { + protected: + classical_2d_image() + {} + }; + + } // end of namespace oln::abstract + + + /// 2-D case. + template <typename E> + struct case_< image_hybrid_hierarchy_wrt_classical, E, 1 > : + where_< mlc::and_list_< mlc::eq_< oln_type_of(E, grid), oln::grid2d >, + mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ >, + mlc::neq_< oln_deduce_type_of(E, topo, bbox), mlc::not_found > + > + > + { + typedef abstract::classical_2d_image<E> ret; + }; + + + /// General case. + template <typename E> + struct case_< image_hybrid_hierarchy_wrt_classical, E, 2 > : + where_< mlc::and_< mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ >, + mlc::neq_< oln_deduce_type_of(E, topo, bbox), mlc::not_found > + > + > + { + typedef abstract::classical_image<E> ret; + }; + + +} // end of namespace oln + + +#endif // ! OLN_CORE_ABSTRACT_IMAGE_HYBRID_CLASSICAL_HH Index: oln/core/abstract/image/hierarchies.hh =================================================================== --- oln/core/abstract/image/hierarchies.hh (revision 581) +++ oln/core/abstract/image/hierarchies.hh (working copy) @@ -41,33 +41,38 @@ typedef hierarchy<abstract::image, 5> image_hierarchy_wrt_accessibility; typedef hierarchy<abstract::image, 6> image_hierarchy_wrt_mutability; + typedef hierarchy<abstract::image, 7> image_hybrid_hierarchy_wrt_classical; + // FIXME: To be continued. #if 0 - typedef hierarchy<abstract::image, 7> image_hierarchy_wrt_value; - typedef hierarchy<abstract::image, 8> image_hierarchy_wrt_data_retrieval; + typedef hierarchy<abstract::image, 8> image_hierarchy_wrt_value; + typedef hierarchy<abstract::image, 9> image_hierarchy_wrt_data_retrieval; // ... #endif } // end of namespace oln -// Hierarchy 1: topology w.r.t. dimension. +// Hierarchy 1: image w.r.t. dimension. # include <oln/core/abstract/image/dimension/hierarchy.hh> -// Hierarchy 2: topology w.r.t. type of data. +// Hierarchy 2: image w.r.t. type of data. # include <oln/core/abstract/image/type/hierarchy.hh> -// Hierarchy 3: topology w.r.t. neighborhood. +// Hierarchy 3: image w.r.t. neighborhood. # include <oln/core/abstract/image/neighborhood/hierarchy.hh> -// Hierarchy 4: topology w.r.t. bounding box. +// Hierarchy 4: image w.r.t. bounding box. # include <oln/core/abstract/image/bbox/hierarchy.hh> -// Hierarchy 5: topology w.r.t. accessibility. +// Hierarchy 5: image w.r.t. accessibility. # include <oln/core/abstract/image/accessibility/hierarchy.hh> -// // // Hierarchy 6: topology w.r.t. data mutability. +// Hierarchy 6: image w.r.t. data mutability. # include <oln/core/abstract/image/mutability/hierarchy.hh> +// Hybrid hierarchy 7: image w.r.t. classical features. +# include <oln/core/abstract/image/hybrid/classical.hh> + #endif // ! OLN_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 581) +++ oln/Makefile.am (working copy) @@ -41,6 +41,7 @@ core/abstract/image/dimension/3d.hh \ core/abstract/image/dimension/hierarchy.hh \ core/abstract/image/hierarchies.hh \ + core/abstract/image/hybrid/classical.hh \ core/abstract/image/mutability/hierarchy.hh \ core/abstract/image/neighborhood/hierarchy.hh \ core/abstract/image/type/binary.hh \ @@ -94,6 +95,8 @@ core/typedefs.hh \ core/type.hh \ \ + debug/print.hh \ + \ morpher/internal/image_extension.hh \ \ morpher/add_neighborhood.hh \

1 0

581: Update grid classes and add static checks for image vtypes.
by Thierry GERAUD 27 Sep '06

27 Sep '06

2006-09-27 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Update grid classes and add static checks for image vtypes. * oln/core/abstract/fwd_decls.hh: New. * tests/image_entry.cc: Update. * oln/core/abstract/image.hh (include): Add fwd_decls. (decl): Add static checks. * oln/core/abstract/image/mutability/hierarchy.hh (lvalue_t, psite_t): Update. oln_check_type_of is now useless cause vtypes are now automatically checked in the decl structure. * oln/core/abstract/image/bbox/hierarchy.hh (bbox_t, point_t): Likewise. (decl): Add static checks. * oln/core/abstract/grid.hh (include): Update. (point_type, dpoint_type, size_type, coord_type): Remove. We have point->grid, not the contrary. (grid): Change inheritance to stc::any__simple. * oln/core/1d/grid1d.hh: Update. * oln/core/2d/grid2d.hh: Update. * oln/core/3d/grid3d.hh: Update. * oln/basics2d.hh (include): Add grid2d. * oln/Makefile.am (nobase_oln_HEADERS): Update. Index: tests/image_entry.cc =================================================================== --- tests/image_entry.cc (revision 580) +++ tests/image_entry.cc (working copy) @@ -31,7 +31,7 @@ // stress image_typeness.hh. This might be done in another test, of // course. -#include <oln/core/1d/grid1d.hh> +#include <oln/basics2d.hh> #include <oln/core/image_entry.hh> namespace my @@ -56,18 +56,19 @@ // inheritance relation to the right abstract::image_dimension // class using the sole grid information (the grid can be seen // here as a ``tag''). - typedef oln::grid1d grid_type; + typedef oln::grid2d grid_type; // Likewise, for the switch of image_typeness using the type of // the value of the image. typedef char value_type; // FIXME: Dummy values. - typedef my::dummy topo_type; - typedef my::dummy point_type; - typedef my::dummy fwd_piter_type; - typedef my::dummy bkd_piter_type; - typedef my::dummy concrete_type; + typedef topo2d topo_type; + typedef point2d point_type; + typedef fwd_piter2d fwd_piter_type; + typedef bkd_piter2d bkd_piter_type; + typedef my::image concrete_type; + typedef my::dummy morpher_type; }; } @@ -90,11 +91,11 @@ main() { // Check its internally defined vtypes. - mlc::assert_< mlc_eq(my::image::grid_t, oln::grid1d) >::check(); + mlc::assert_< mlc_eq(my::image::grid_t, oln::grid2d) >::check(); mlc::assert_< mlc_eq(my::image::value_t, char) >::check(); // Check its image dimension abstraction. - mlc::assert_< mlc_is_a_(my::image, oln::abstract::image1d) >::check(); + mlc::assert_< mlc_is_a_(my::image, oln::abstract::image2d) >::check(); // Check its image type abstraction. mlc::assert_< mlc_is_a_(my::image, oln::abstract::grey_level_image) >::check(); Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 580) +++ oln/core/abstract/image.hh (working copy) @@ -30,6 +30,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_HH # include <oln/core/typedefs.hh> +# include <oln/core/abstract/fwd_decls.hh> # include <oln/automatic/image.hh> @@ -60,8 +61,8 @@ public: - struct decl { - + struct decl + { stc_virtual_typedef(topo); stc_virtual_typedef(grid); @@ -79,8 +80,15 @@ stc_virtual_typedef(morpher); - decl() { - // FIXME: ... + decl() + { + mlc::assert_< mlc_is_a(topo, abstract::topology) >::check(); + mlc::assert_< mlc_is_a(grid, abstract::grid) >::check(); + mlc::assert_< mlc_is_a(piter, abstract::iterator_on_points) >::check(); + mlc::assert_< mlc_is_a(fwd_piter, abstract::iterator_on_points) >::check(); + mlc::assert_< mlc_is_a(bkd_piter, abstract::iterator_on_points) >::check(); + // FIXME: Rec. + // mlc::assert_< mlc_is_a(concrete, abstract::image) >::check(); } }; Index: oln/core/abstract/image/mutability/hierarchy.hh =================================================================== --- oln/core/abstract/image/mutability/hierarchy.hh (revision 580) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -53,12 +53,13 @@ { private: - typedef oln_check_type_of(E, lvalue) lvalue_t; - typedef oln_check_type_of(E, psite) psite_t; + typedef oln_type_of(E, lvalue) lvalue_t; + typedef oln_type_of(E, psite) psite_t; public: - struct decl { + struct decl + { stc_virtual_typedef(lvalue); }; Index: oln/core/abstract/image/bbox/hierarchy.hh =================================================================== --- oln/core/abstract/image/bbox/hierarchy.hh (revision 580) +++ oln/core/abstract/image/bbox/hierarchy.hh (working copy) @@ -29,8 +29,10 @@ # define OLN_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/bbox.hh> + namespace oln { @@ -49,13 +51,19 @@ { private: - typedef oln_check_type_of(E, bbox) bbox_t; - typedef oln_check_type_of(E, point) point_t; + typedef oln_type_of(E, bbox) bbox_t; + typedef oln_type_of(E, point) point_t; public: - struct decl { + struct decl + { stc_virtual_typedef(bbox); + + decl() + { + mlc::assert_< mlc_is_a(bbox, abstract::bbox) >::check(); + } }; // Concrete method. Index: oln/core/abstract/grid.hh =================================================================== --- oln/core/abstract/grid.hh (revision 580) +++ oln/core/abstract/grid.hh (working copy) @@ -28,10 +28,6 @@ #ifndef OLN_CORE_ABSTRACT_GRID_HH # define OLN_CORE_ABSTRACT_GRID_HH -# include <mlc/assert.hh> -# include <mlc/cmp.hh> -# include <mlc/to_string.hh> -# include <oln/core/abstract/any.hh> # include <oln/core/typedefs.hh> @@ -40,24 +36,20 @@ // Forward declaration. namespace abstract { - template <typename G> class grid; + template <typename E> class grid; } - /// Virtual types associated to oln::abstract::image. - template <typename G> - struct vtypes< abstract::grid<G> > + /// Virtual types associated to oln::abstract::grid. + template <typename E> + struct vtypes< abstract::grid<E> > { - typedef mlc::undefined point_type; - typedef mlc::none dpoint_type; - typedef mlc::undefined size_type; - typedef mlc::undefined coord_type; typedef mlc::undefined dimvalue_type; }; namespace abstract { template <typename E> - struct grid : public oln::abstract::any<E> + struct grid : public virtual stc::any__simple<E> { protected: grid() Index: oln/core/abstract/fwd_decls.hh =================================================================== --- oln/core/abstract/fwd_decls.hh (revision 0) +++ oln/core/abstract/fwd_decls.hh (revision 0) @@ -0,0 +1,53 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_ABSTRACT_FWD_DECLS_HH +# define OLN_CORE_ABSTRACT_FWD_DECLS_HH + +namespace oln +{ + + namespace abstract + { + + template <typename E> class bbox; + template <typename E> class dpoint; + template <typename E> class grid; + template <typename E> class image; + template <typename E> class iterator; + template <typename E> class iterator_on_points; + template <typename E> class neighborhood; + template <typename E> class point; + template <typename E> class point_set; + template <typename E> class topology; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLN_CORE_ABSTRACT_FWD_DECLS_HH Index: oln/core/1d/grid1d.hh =================================================================== --- oln/core/1d/grid1d.hh (revision 580) +++ oln/core/1d/grid1d.hh (working copy) @@ -35,12 +35,8 @@ namespace oln { - // Forward declarations. - class grid1d; - class point1d; - class dpoint1d; - class size1d; - class coord_t; + // Fwd decl. + struct grid1d; // Super type. stc_set_super(grid1d, abstract::grid<grid1d>); @@ -49,14 +45,10 @@ template <> struct vtypes<grid1d> { - typedef point1d point_type; - typedef dpoint1d dpoint_type; - typedef coord_t coord_type; - typedef size1d size_type; typedef mlc::uint_<1> dimvalue_type; }; - /// A 1-dimension rectangular grid. + /// A 1-dimension grid. struct grid1d : public stc_get_supers(grid1d) { protected: Index: oln/core/2d/grid2d.hh =================================================================== --- oln/core/2d/grid2d.hh (revision 580) +++ oln/core/2d/grid2d.hh (working copy) @@ -35,12 +35,8 @@ namespace oln { - // Forward declarations. + // Fwd decl. struct grid2d; - struct point2d; - struct dpoint2d; - struct size2d; - struct coord_t; // Super type. stc_set_super(grid2d, abstract::grid<grid2d>); @@ -49,10 +45,6 @@ template <> struct vtypes<grid2d> { - typedef point2d point_type; - typedef dpoint2d dpoint_type; - typedef size2d size_type; - typedef coord_t coord_type; typedef mlc::uint_<2> dimvalue_type; }; Index: oln/core/3d/grid3d.hh =================================================================== --- oln/core/3d/grid3d.hh (revision 580) +++ oln/core/3d/grid3d.hh (working copy) @@ -34,13 +34,8 @@ namespace oln { - - // Forward declarations. + // Fwd decl. struct grid3d; - struct point3d; - struct dpoint3d; - struct size3d; - struct coord_t; // Super type. stc_set_super(grid3d, abstract::grid<grid3d>); @@ -49,14 +44,10 @@ template <> struct vtypes<grid3d> { - typedef point3d point_type; - typedef dpoint3d dpoint_type; - typedef size3d size_type; - typedef coord_t coord_type; typedef mlc::uint_<3> dimvalue_type; }; - /// A 3-dimension rectangular grid. + /// A 3-dimension cubic grid. struct grid3d : public stc_get_supers(grid3d) { protected: Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 580) +++ oln/basics2d.hh (working copy) @@ -32,6 +32,8 @@ # include <oln/core/2d/aliases.hh> +# include <oln/core/2d/grid2d.hh> + # include <oln/core/2d/point2d.hh> namespace oln { template class point2d_<int>; } @@ -54,7 +56,6 @@ namespace oln { template class neighb_<dpoint2d>; } # include <oln/core/2d/neighb2d.hh> - # include <oln/core/2d/image2d.hh> Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 580) +++ oln/Makefile.am (working copy) @@ -31,6 +31,7 @@ core/abstract/bbox.hh \ core/abstract/dpoint.hh \ core/abstract/entry.hh \ + core/abstract/fwd_decls.hh \ core/abstract/grid.hh \ core/abstract/image.hh \ core/abstract/image/accessibility/hierarchy.hh \

1 0

580: Enforce safety in some SCOOP tools.
by Thierry GERAUD 27 Sep '06

27 Sep '06

2006-09-27 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Enforce safety in some SCOOP tools. * stc/scoop.hh (stc_set_nth_super, stc_set_super): Add "end of semicolon" safety. (stc_virtual_typedef): Use oln_check_type_of instead of oln_type_of. Index: stc/scoop.hh =================================================================== --- stc/scoop.hh (revision 579) +++ stc/scoop.hh (working copy) @@ -900,7 +900,8 @@ struct set_super_type< Type, N > \ { \ typedef Super ret; \ - }; + }; \ + struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n // Shortcut. #define stc_set_super(Type, Super) \ @@ -957,8 +958,10 @@ struct set_pseudosuper_type<Type> \ { \ typedef PseudoSuper ret; \ - } + }; \ + struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n + /// \def Get the pseudosuper class of Type (version to be used inside a /// template). # define stc_get_pseudosuper(Type) \ @@ -1042,7 +1045,7 @@ /// for details). Warning: this macro assumes that the exact type /// parameter is named 'E'. #define stc_virtual_typedef(Typedef) \ - typedef oln_type_of(E, Typedef) Typedef + typedef oln_check_type_of(E, Typedef) Typedef #endif // ! STATIC_SCOOP_HH

1 0

579: Adjust guards to directory names.
by Thierry GERAUD 27 Sep '06

27 Sep '06

2006-09-27 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Adjust guards to directory names. * oln/automatic/topology_having_bbox.hh: Adjust guard to directory name. * oln/automatic/image.hh: Likewise. * oln/automatic/image_being_random_accessible.hh: Likewise. * oln/automatic/image_having_neighborhood.hh: Likewise. * oln/automatic/topology_being_random_accessible.hh: Likewise. * oln/automatic/topology_having_neighborhood.hh: Likewise. * oln/automatic/image_being_mutable.hh: Likewise. * oln/core/type.hh: Likewise. * oln/core/traits_id.hh: Likewise. * oln/core/typedefs.hh: Likewise. * oln/core/macros.hh: Likewise. * oln/core/point_set_entry.hh: Likewise. * oln/core/neighborhood_entry.hh: Likewise. * oln/core/topology_entry.hh: Likewise. * oln/core/image_entry.hh: Likewise. * oln/core/abstract/iterator_on_points.hh: Likewise. * oln/core/abstract/image.hh: Likewise. * oln/core/abstract/topology_hierarchies.hh: Likewise. * oln/core/abstract/topology_having_bbox.hh: Likewise. * oln/core/abstract/image/type/binary.hh: Likewise. * oln/core/abstract/image/type/data.hh: Likewise. * oln/core/abstract/image/type/integre.hh: Likewise. * oln/core/abstract/image/type/grey_level.hh: Likewise. * oln/core/abstract/image/type/hierarchy.hh: Likewise. * oln/core/abstract/image/type/color.hh: Likewise. * oln/core/abstract/image/type/label.hh: Likewise. * oln/core/abstract/image/mutability/hierarchy.hh: Likewise. * oln/core/abstract/image/hierarchies.hh: Likewise. * oln/core/abstract/image/dimension/1d.hh: Likewise. * oln/core/abstract/image/dimension/2d.hh: Likewise. * oln/core/abstract/image/dimension/3d.hh: Likewise. * oln/core/abstract/image/dimension/hierarchy.hh: Likewise. * oln/core/abstract/image/neighborhood/hierarchy.hh: Likewise. * oln/core/abstract/image/accessibility/hierarchy.hh: Likewise. * oln/core/abstract/image/bbox/hierarchy.hh: Likewise. * oln/core/abstract/grid.hh: Likewise. * oln/core/abstract/point_set_being_random_accessible.hh: Likewise. * oln/core/abstract/any.hh: Likewise. * oln/core/abstract/point.hh: Likewise. * oln/core/abstract/iterator.hh: Likewise. * oln/core/abstract/point_set_being_connected.hh: Likewise. * oln/core/abstract/bbox.hh: Likewise. * oln/core/abstract/topology_being_random_accessible.hh: Likewise. * oln/core/abstract/dpoint.hh: Likewise. * oln/core/abstract/topology_having_neighborhood.hh: Likewise. * oln/core/abstract/entry.hh: Likewise. * oln/core/abstract/point_set.hh: Likewise. * oln/core/abstract/point_set_having_known_size.hh: Likewise. * oln/core/abstract/neighborhood.hh: Likewise. * oln/core/abstract/point_set_having_bbox.hh: Likewise. * oln/core/abstract/point_set_hierarchies.hh: Likewise. * oln/core/abstract/topology.hh: Likewise. * oln/core/abstract/internal/image_impl.hh: Likewise. * oln/core/1d/grid1d.hh: Likewise. * oln/core/traits.hh: Likewise. * oln/core/2d/aliases.hh: Likewise. * oln/core/2d/neighb2d.hh: Likewise. * oln/core/2d/dpoint2d.hh: Likewise. * oln/core/2d/array2d.hh: Likewise. * oln/core/2d/image2d.hh: Likewise. * oln/core/2d/grid2d.hh: Likewise. * oln/core/2d/point2d.hh: Likewise. * oln/core/3d/grid3d.hh: Likewise. * oln/core/case.hh: Likewise. * oln/core/gen/topo_lbbox.hh: Likewise. * oln/core/gen/bbox.hh: Likewise. * oln/core/gen/topo_bbox.hh: Likewise. * oln/core/gen/neighb.hh: Likewise. * oln/core/gen/fwd_piter_bbox.hh: Likewise. * oln/core/gen/bbox_fwd_piter.hh: Likewise. * oln/core/gen/bbox_bkd_piter.hh: Likewise. * oln/core/gen/bkd_piter_bbox.hh: Likewise. * oln/core/gen/topo_add_nbh.hh: Likewise. * oln/core/gen/mapimage.hh: Likewise. * oln/core/internal/topology_morpher.hh: Likewise. * oln/core/internal/point_nd.hh: Likewise. * oln/core/internal/bbox_bkd_piter.hh: Likewise. * oln/core/internal/bbox_fwd_piter.hh: Likewise. * oln/core/internal/dpoint_nd.hh: Likewise. * oln/basics2d.hh: Likewise. * oln/morpher/identity.hh: Likewise. * oln/morpher/internal/image_extension.hh: Likewise. * oln/morpher/tags.hh: Likewise. * oln/morpher/add_neighborhood.hh: Likewise. Index: oln/automatic/topology_having_bbox.hh =================================================================== --- oln/automatic/topology_having_bbox.hh (revision 577) +++ oln/automatic/topology_having_bbox.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH -# define OLENA_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +#ifndef OLN_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +# define OLN_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -71,4 +71,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +#endif // ! OLN_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH Index: oln/automatic/image.hh =================================================================== --- oln/automatic/image.hh (revision 577) +++ oln/automatic/image.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_IMAGE_HH -# define OLENA_AUTOMATIC_IMAGE_HH +#ifndef OLN_AUTOMATIC_IMAGE_HH +# define OLN_AUTOMATIC_IMAGE_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -79,4 +79,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_IMAGE_HH +#endif // ! OLN_AUTOMATIC_IMAGE_HH Index: oln/automatic/image_being_random_accessible.hh =================================================================== --- oln/automatic/image_being_random_accessible.hh (revision 577) +++ oln/automatic/image_being_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH -# define OLENA_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -101,4 +101,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH Index: oln/automatic/image_having_neighborhood.hh =================================================================== --- oln/automatic/image_having_neighborhood.hh (revision 577) +++ oln/automatic/image_having_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH -# define OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +# define OLN_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -67,4 +67,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH Index: oln/automatic/topology_being_random_accessible.hh =================================================================== --- oln/automatic/topology_being_random_accessible.hh (revision 577) +++ oln/automatic/topology_being_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# define OLENA_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -76,4 +76,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/automatic/topology_having_neighborhood.hh =================================================================== --- oln/automatic/topology_having_neighborhood.hh (revision 577) +++ oln/automatic/topology_having_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH -# define OLENA_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLN_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -71,4 +71,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/automatic/image_being_mutable.hh =================================================================== --- oln/automatic/image_being_mutable.hh (revision 577) +++ oln/automatic/image_being_mutable.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_IMAGE_BEING_MUTABLE_HH -# define OLENA_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +#ifndef OLN_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +# define OLN_AUTOMATIC_IMAGE_BEING_MUTABLE_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -66,4 +66,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +#endif // ! OLN_AUTOMATIC_IMAGE_BEING_MUTABLE_HH Index: oln/core/type.hh =================================================================== --- oln/core/type.hh (revision 577) +++ oln/core/type.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_TYPE_HH -# define OLENA_CORE_TYPE_HH +#ifndef OLN_CORE_TYPE_HH +# define OLN_CORE_TYPE_HH namespace oln @@ -41,4 +41,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_TYPE_HH +#endif // ! OLN_CORE_TYPE_HH Index: oln/core/traits_id.hh =================================================================== --- oln/core/traits_id.hh (revision 577) +++ oln/core/traits_id.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_TRAITS_ID_HH -# define OLENA_CORE_TRAITS_ID_HH +#ifndef OLN_CORE_TRAITS_ID_HH +# define OLN_CORE_TRAITS_ID_HH # include <oln/core/traits.hh> @@ -77,4 +77,4 @@ -#endif // ! OLENA_CORE_TRAITS_ID_HH +#endif // ! OLN_CORE_TRAITS_ID_HH Index: oln/core/typedefs.hh =================================================================== --- oln/core/typedefs.hh (revision 577) +++ oln/core/typedefs.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_TYPEDEFS_HH -# define OLENA_CORE_TYPEDEFS_HH +#ifndef OLN_CORE_TYPEDEFS_HH +# define OLN_CORE_TYPEDEFS_HH # include <iostream> @@ -200,4 +200,4 @@ # include <oln/core/abstract/entry.hh> -#endif // ! OLENA_CORE_TYPEDEFS_HH +#endif // ! OLN_CORE_TYPEDEFS_HH Index: oln/core/macros.hh =================================================================== --- oln/core/macros.hh (revision 577) +++ oln/core/macros.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_MACROS_HH -# define OLENA_CORE_MACROS_HH +#ifndef OLN_CORE_MACROS_HH +# define OLN_CORE_MACROS_HH // --------------------- // // Virtual type access. // @@ -124,4 +124,4 @@ stc_check_direct_type_of_(oln, void, OlnType, Alias) -#endif // ! OLENA_CORE_MACROS_HH +#endif // ! OLN_CORE_MACROS_HH Index: oln/core/point_set_entry.hh =================================================================== --- oln/core/point_set_entry.hh (revision 577) +++ oln/core/point_set_entry.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_POINT_SET_ENTRY_HH -# define OLENA_CORE_POINT_SET_ENTRY_HH +#ifndef OLN_CORE_POINT_SET_ENTRY_HH +# define OLN_CORE_POINT_SET_ENTRY_HH # include <oln/core/abstract/entry.hh> # include <oln/core/abstract/point_set.hh> @@ -100,4 +100,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_POINT_SET_ENTRY_HH +#endif // ! OLN_CORE_POINT_SET_ENTRY_HH Index: oln/core/neighborhood_entry.hh =================================================================== --- oln/core/neighborhood_entry.hh (revision 577) +++ oln/core/neighborhood_entry.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_NEIGHBORHOOD_ENTRY_HH -# define OLENA_CORE_NEIGHBORHOOD_ENTRY_HH +#ifndef OLN_CORE_NEIGHBORHOOD_ENTRY_HH +# define OLN_CORE_NEIGHBORHOOD_ENTRY_HH # include <oln/core/abstract/entry.hh> # include <oln/core/abstract/neighborhood.hh> @@ -60,4 +60,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_NEIGHBORHOOD_ENTRY_HH +#endif // ! OLN_CORE_NEIGHBORHOOD_ENTRY_HH Index: oln/core/topology_entry.hh =================================================================== --- oln/core/topology_entry.hh (revision 577) +++ oln/core/topology_entry.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_TOPOLOGY_ENTRY_HH -# define OLENA_CORE_TOPOLOGY_ENTRY_HH +#ifndef OLN_CORE_TOPOLOGY_ENTRY_HH +# define OLN_CORE_TOPOLOGY_ENTRY_HH # include <oln/core/abstract/entry.hh> # include <oln/core/abstract/topology.hh> @@ -69,4 +69,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_TOPOLOGY_ENTRY_HH +#endif // ! OLN_CORE_TOPOLOGY_ENTRY_HH Index: oln/core/image_entry.hh =================================================================== --- oln/core/image_entry.hh (revision 577) +++ oln/core/image_entry.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_IMAGE_ENTRY_HH -# define OLENA_CORE_IMAGE_ENTRY_HH +#ifndef OLN_CORE_IMAGE_ENTRY_HH +# define OLN_CORE_IMAGE_ENTRY_HH # include <oln/core/abstract/entry.hh> # include <oln/core/abstract/image.hh> @@ -99,4 +99,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_IMAGE_ENTRY_HH +#endif // ! OLN_CORE_IMAGE_ENTRY_HH Index: oln/core/abstract/iterator_on_points.hh =================================================================== --- oln/core/abstract/iterator_on_points.hh (revision 577) +++ oln/core/abstract/iterator_on_points.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_ITERATOR_ON_POINTS_HH -# define OLENA_CORE_ABSTRACT_ITERATOR_ON_POINTS_HH +#ifndef OLN_CORE_ABSTRACT_ITERATOR_ON_POINTS_HH +# define OLN_CORE_ABSTRACT_ITERATOR_ON_POINTS_HH # include <oln/core/abstract/iterator.hh> # include <oln/core/abstract/point.hh> @@ -107,4 +107,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_ITERATOR_ON_POINTS_HH +#endif // ! OLN_CORE_ABSTRACT_ITERATOR_ON_POINTS_HH Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 577) +++ oln/core/abstract/image.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_HH -# define OLENA_CORE_ABSTRACT_IMAGE_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_HH +# define OLN_CORE_ABSTRACT_IMAGE_HH # include <oln/core/typedefs.hh> # include <oln/automatic/image.hh> @@ -144,4 +144,4 @@ # include <oln/core/abstract/image/hierarchies.hh> -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_HH Index: oln/core/abstract/topology_hierarchies.hh =================================================================== --- oln/core/abstract/topology_hierarchies.hh (revision 577) +++ oln/core/abstract/topology_hierarchies.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH -# define OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH # include <oln/core/abstract/topology.hh> @@ -52,5 +52,5 @@ -#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH Index: oln/core/abstract/topology_having_bbox.hh =================================================================== --- oln/core/abstract/topology_having_bbox.hh (revision 577) +++ oln/core/abstract/topology_having_bbox.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH -# define OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH # include <oln/core/abstract/topology.hh> # include <oln/automatic/topology_having_bbox.hh> @@ -89,4 +89,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH Index: oln/core/abstract/image/type/binary.hh =================================================================== --- oln/core/abstract/image/type/binary.hh (revision 577) +++ oln/core/abstract/image/type/binary.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH # include <oln/core/abstract/image/type/label.hh> @@ -53,4 +53,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH Index: oln/core/abstract/image/type/data.hh =================================================================== --- oln/core/abstract/image/type/data.hh (revision 577) +++ oln/core/abstract/image/type/data.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH # include <oln/core/abstract/image.hh> @@ -51,4 +51,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH Index: oln/core/abstract/image/type/integre.hh =================================================================== --- oln/core/abstract/image/type/integre.hh (revision 577) +++ oln/core/abstract/image/type/integre.hh (working copy) @@ -29,8 +29,8 @@ // FIXME: Move this file into Integre? Or in a another project, // serving as a glue between Integre and Olena? -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH # include <oln/core/abstract/image/type/hierarchy.hh> @@ -142,4 +142,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH Index: oln/core/abstract/image/type/grey_level.hh =================================================================== --- oln/core/abstract/image/type/grey_level.hh (revision 577) +++ oln/core/abstract/image/type/grey_level.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH # include <oln/core/abstract/image.hh> @@ -57,4 +57,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH Index: oln/core/abstract/image/type/hierarchy.hh =================================================================== --- oln/core/abstract/image/type/hierarchy.hh (revision 577) +++ oln/core/abstract/image/type/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -140,4 +140,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH Index: oln/core/abstract/image/type/color.hh =================================================================== --- oln/core/abstract/image/type/color.hh (revision 577) +++ oln/core/abstract/image/type/color.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH # include <oln/core/abstract/image.hh> @@ -52,4 +52,4 @@ -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH Index: oln/core/abstract/image/type/label.hh =================================================================== --- oln/core/abstract/image/type/label.hh (revision 577) +++ oln/core/abstract/image/type/label.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH +# define OLN_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH # include <oln/core/abstract/image.hh> @@ -53,4 +53,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH Index: oln/core/abstract/image/mutability/hierarchy.hh =================================================================== --- oln/core/abstract/image/mutability/hierarchy.hh (revision 577) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -101,4 +101,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH Index: oln/core/abstract/image/hierarchies.hh =================================================================== --- oln/core/abstract/image/hierarchies.hh (revision 577) +++ oln/core/abstract/image/hierarchies.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH -# define OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH +# define OLN_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH # include <oln/core/abstract/image.hh> @@ -70,4 +70,4 @@ # include <oln/core/abstract/image/mutability/hierarchy.hh> -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH Index: oln/core/abstract/image/dimension/1d.hh =================================================================== --- oln/core/abstract/image/dimension/1d.hh (revision 577) +++ oln/core/abstract/image/dimension/1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH -# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH +# define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH # include <oln/core/abstract/image.hh> @@ -52,4 +52,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH Index: oln/core/abstract/image/dimension/2d.hh =================================================================== --- oln/core/abstract/image/dimension/2d.hh (revision 577) +++ oln/core/abstract/image/dimension/2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH -# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH +# define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH # include <oln/core/abstract/image.hh> @@ -53,4 +53,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH Index: oln/core/abstract/image/dimension/3d.hh =================================================================== --- oln/core/abstract/image/dimension/3d.hh (revision 577) +++ oln/core/abstract/image/dimension/3d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH -# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH +# define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH # include <oln/core/abstract/image.hh> @@ -53,4 +53,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH Index: oln/core/abstract/image/dimension/hierarchy.hh =================================================================== --- oln/core/abstract/image/dimension/hierarchy.hh (revision 577) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -117,4 +117,4 @@ } -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH Index: oln/core/abstract/image/neighborhood/hierarchy.hh =================================================================== --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 577) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -107,4 +107,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH Index: oln/core/abstract/image/accessibility/hierarchy.hh =================================================================== --- oln/core/abstract/image/accessibility/hierarchy.hh (revision 577) +++ oln/core/abstract/image/accessibility/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> # include <oln/automatic/image_being_random_accessible.hh> @@ -89,4 +89,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH Index: oln/core/abstract/image/bbox/hierarchy.hh =================================================================== --- oln/core/abstract/image/bbox/hierarchy.hh (revision 577) +++ oln/core/abstract/image/bbox/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH -# define OLENA_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -116,4 +116,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH Index: oln/core/abstract/grid.hh =================================================================== --- oln/core/abstract/grid.hh (revision 577) +++ oln/core/abstract/grid.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_GRID_HH -# define OLENA_CORE_ABSTRACT_GRID_HH +#ifndef OLN_CORE_ABSTRACT_GRID_HH +# define OLN_CORE_ABSTRACT_GRID_HH # include <mlc/assert.hh> # include <mlc/cmp.hh> @@ -69,4 +69,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_GRID_HH +#endif // ! OLN_CORE_ABSTRACT_GRID_HH Index: oln/core/abstract/point_set_being_random_accessible.hh =================================================================== --- oln/core/abstract/point_set_being_random_accessible.hh (revision 577) +++ oln/core/abstract/point_set_being_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH -# define OLENA_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/abstract/point_set.hh> @@ -71,4 +71,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/any.hh =================================================================== --- oln/core/abstract/any.hh (revision 577) +++ oln/core/abstract/any.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_ANY_HH -# define OLENA_CORE_ABSTRACT_ANY_HH +#ifndef OLN_CORE_ABSTRACT_ANY_HH +# define OLN_CORE_ABSTRACT_ANY_HH # include <stc/any.hh> # include <mlc/bool.hh> @@ -69,4 +69,4 @@ mlc_is_a(Type, oln::abstract::any_best_speed) > -#endif // ! OLENA_CORE_ABSTRACT_ANY_HH +#endif // ! OLN_CORE_ABSTRACT_ANY_HH Index: oln/core/abstract/point.hh =================================================================== --- oln/core/abstract/point.hh (revision 577) +++ oln/core/abstract/point.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_HH -# define OLENA_CORE_ABSTRACT_POINT_HH +#ifndef OLN_CORE_ABSTRACT_POINT_HH +# define OLN_CORE_ABSTRACT_POINT_HH # include <oln/core/typedefs.hh> # include <oln/core/traits_id.hh> @@ -319,4 +319,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_POINT_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_HH Index: oln/core/abstract/iterator.hh =================================================================== --- oln/core/abstract/iterator.hh (revision 577) +++ oln/core/abstract/iterator.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_ITERATOR_HH -# define OLENA_CORE_ABSTRACT_ITERATOR_HH +#ifndef OLN_CORE_ABSTRACT_ITERATOR_HH +# define OLN_CORE_ABSTRACT_ITERATOR_HH # include <oln/core/typedefs.hh> @@ -85,4 +85,4 @@ #define for_all(i) for (i.start(); i.is_valid(); i.next()) -#endif // ! OLENA_CORE_ABSTRACT_ITERATOR_HH +#endif // ! OLN_CORE_ABSTRACT_ITERATOR_HH Index: oln/core/abstract/point_set_being_connected.hh =================================================================== --- oln/core/abstract/point_set_being_connected.hh (revision 577) +++ oln/core/abstract/point_set_being_connected.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH -# define OLENA_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH +# define OLN_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH # include <oln/core/abstract/point_set.hh> @@ -79,4 +79,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH Index: oln/core/abstract/bbox.hh =================================================================== --- oln/core/abstract/bbox.hh (revision 577) +++ oln/core/abstract/bbox.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_BBOX_HH -# define OLENA_CORE_ABSTRACT_BBOX_HH +#ifndef OLN_CORE_ABSTRACT_BBOX_HH +# define OLN_CORE_ABSTRACT_BBOX_HH # include <oln/core/abstract/point_set_having_bbox.hh> @@ -94,4 +94,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_BBOX_HH +#endif // ! OLN_CORE_ABSTRACT_BBOX_HH Index: oln/core/abstract/topology_being_random_accessible.hh =================================================================== --- oln/core/abstract/topology_being_random_accessible.hh (revision 577) +++ oln/core/abstract/topology_being_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# define OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/abstract/topology.hh> # include <oln/automatic/topology_being_random_accessible.hh> @@ -82,4 +82,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/dpoint.hh =================================================================== --- oln/core/abstract/dpoint.hh (revision 577) +++ oln/core/abstract/dpoint.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_DPOINT_HH -# define OLENA_CORE_ABSTRACT_DPOINT_HH +#ifndef OLN_CORE_ABSTRACT_DPOINT_HH +# define OLN_CORE_ABSTRACT_DPOINT_HH # include <oln/core/typedefs.hh> @@ -106,4 +106,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_DPOINT_HH +#endif // ! OLN_CORE_ABSTRACT_DPOINT_HH Index: oln/core/abstract/topology_having_neighborhood.hh =================================================================== --- oln/core/abstract/topology_having_neighborhood.hh (revision 577) +++ oln/core/abstract/topology_having_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH -# define OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH # include <oln/core/abstract/topology.hh> # include <oln/automatic/topology_having_neighborhood.hh> @@ -83,4 +83,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/core/abstract/entry.hh =================================================================== --- oln/core/abstract/entry.hh (revision 577) +++ oln/core/abstract/entry.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_ENTRY_HH -# define OLENA_CORE_ABSTRACT_ENTRY_HH +#ifndef OLN_CORE_ABSTRACT_ENTRY_HH +# define OLN_CORE_ABSTRACT_ENTRY_HH # include <oln/core/typedefs.hh> # include <oln/core/case.hh> @@ -133,4 +133,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_ENTRY_HH +#endif // ! OLN_CORE_ABSTRACT_ENTRY_HH Index: oln/core/abstract/point_set.hh =================================================================== --- oln/core/abstract/point_set.hh (revision 577) +++ oln/core/abstract/point_set.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_SET_HH -# define OLENA_CORE_ABSTRACT_POINT_SET_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_HH +# define OLN_CORE_ABSTRACT_POINT_SET_HH # include <oln/core/typedefs.hh> @@ -98,4 +98,4 @@ -#endif // ! OLENA_CORE_ABSTRACT_POINT_SET_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_HH Index: oln/core/abstract/point_set_having_known_size.hh =================================================================== --- oln/core/abstract/point_set_having_known_size.hh (revision 577) +++ oln/core/abstract/point_set_having_known_size.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH -# define OLENA_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH +# define OLN_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH # include <oln/core/abstract/point_set.hh> @@ -69,5 +69,5 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH Index: oln/core/abstract/neighborhood.hh =================================================================== --- oln/core/abstract/neighborhood.hh (revision 577) +++ oln/core/abstract/neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_NEIGHBORHOOD_HH -# define OLENA_CORE_ABSTRACT_NEIGHBORHOOD_HH +#ifndef OLN_CORE_ABSTRACT_NEIGHBORHOOD_HH +# define OLN_CORE_ABSTRACT_NEIGHBORHOOD_HH # include <oln/core/typedefs.hh> @@ -79,4 +79,4 @@ -#endif // ! OLENA_CORE_ABSTRACT_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_ABSTRACT_NEIGHBORHOOD_HH Index: oln/core/abstract/point_set_having_bbox.hh =================================================================== --- oln/core/abstract/point_set_having_bbox.hh (revision 577) +++ oln/core/abstract/point_set_having_bbox.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH -# define OLENA_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH +# define OLN_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH # include <oln/core/abstract/point_set.hh> @@ -106,4 +106,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH Index: oln/core/abstract/point_set_hierarchies.hh =================================================================== --- oln/core/abstract/point_set_hierarchies.hh (revision 577) +++ oln/core/abstract/point_set_hierarchies.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH -# define OLENA_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH +# define OLN_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH # include <oln/core/abstract/point_set.hh> @@ -50,5 +50,5 @@ -#endif // ! OLENA_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH Index: oln/core/abstract/topology.hh =================================================================== --- oln/core/abstract/topology.hh (revision 577) +++ oln/core/abstract/topology.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HH -# define OLENA_CORE_ABSTRACT_TOPOLOGY_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_HH # include <oln/core/typedefs.hh> @@ -87,4 +87,4 @@ -#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HH Index: oln/core/abstract/internal/image_impl.hh =================================================================== --- oln/core/abstract/internal/image_impl.hh (revision 577) +++ oln/core/abstract/internal/image_impl.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_INTERNAL_IMAGE_IMPL_HH -# define OLENA_CORE_ABSTRACT_INTERNAL_IMAGE_IMPL_HH +#ifndef OLN_CORE_ABSTRACT_INTERNAL_IMAGE_IMPL_HH +# define OLN_CORE_ABSTRACT_INTERNAL_IMAGE_IMPL_HH # include <mlc/flags.hh> # include <oln/core/typedefs.hh> @@ -132,4 +132,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_INTERNAL_IMAGE_IMPL_HH +#endif // ! OLN_CORE_ABSTRACT_INTERNAL_IMAGE_IMPL_HH Index: oln/core/1d/grid1d.hh =================================================================== --- oln/core/1d/grid1d.hh (revision 577) +++ oln/core/1d/grid1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_1D_GRID1D_HH -# define OLENA_CORE_1D_GRID1D_HH +#ifndef OLN_CORE_1D_GRID1D_HH +# define OLN_CORE_1D_GRID1D_HH # include <mlc/int.hh> # include <oln/core/abstract/grid.hh> @@ -66,4 +66,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_1D_GRID1D_HH +#endif // ! OLN_CORE_1D_GRID1D_HH Index: oln/core/traits.hh =================================================================== --- oln/core/traits.hh (revision 577) +++ oln/core/traits.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_TRAITS_HH -# define OLENA_CORE_TRAITS_HH +#ifndef OLN_CORE_TRAITS_HH +# define OLN_CORE_TRAITS_HH # include <mlc/assert.hh> @@ -88,4 +88,4 @@ -#endif // ! OLENA_CORE_TRAITS_HH +#endif // ! OLN_CORE_TRAITS_HH Index: oln/core/2d/aliases.hh =================================================================== --- oln/core/2d/aliases.hh (revision 577) +++ oln/core/2d/aliases.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_ALIASES_HH -# define OLENA_CORE_2D_ALIASES_HH +#ifndef OLN_CORE_2D_ALIASES_HH +# define OLN_CORE_2D_ALIASES_HH namespace oln @@ -66,4 +66,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_2D_ALIASES_HH +#endif // ! OLN_CORE_2D_ALIASES_HH Index: oln/core/2d/neighb2d.hh =================================================================== --- oln/core/2d/neighb2d.hh (revision 577) +++ oln/core/2d/neighb2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_NEIGHB2D_HH -# define OLENA_CORE_2D_NEIGHB2D_HH +#ifndef OLN_CORE_2D_NEIGHB2D_HH +# define OLN_CORE_2D_NEIGHB2D_HH # include <oln/core/gen/neighb.hh> # include <oln/core/2d/aliases.hh> @@ -100,4 +100,4 @@ -#endif // ! OLENA_CORE_2D_NEIGHB2D_HH +#endif // ! OLN_CORE_2D_NEIGHB2D_HH Index: oln/core/2d/dpoint2d.hh =================================================================== --- oln/core/2d/dpoint2d.hh (revision 577) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_DPOINT2D_HH -# define OLENA_CORE_2D_DPOINT2D_HH +#ifndef OLN_CORE_2D_DPOINT2D_HH +# define OLN_CORE_2D_DPOINT2D_HH # include <mlc/int.hh> # include <oln/core/2d/point2d.hh> @@ -98,4 +98,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_2D_DPOINT2D_HH +#endif // ! OLN_CORE_2D_DPOINT2D_HH Index: oln/core/2d/array2d.hh =================================================================== --- oln/core/2d/array2d.hh (revision 578) +++ oln/core/2d/array2d.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_ARRAY2D_HH -# define OLENA_CORE_2D_ARRAY2D_HH +#ifndef OLN_CORE_2D_ARRAY2D_HH +# define OLN_CORE_2D_ARRAY2D_HH # include <cstdlib> # include <set> @@ -310,4 +310,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_2D_ARRAY2D_HH +#endif // ! OLN_CORE_2D_ARRAY2D_HH Index: oln/core/2d/image2d.hh =================================================================== --- oln/core/2d/image2d.hh (revision 578) +++ oln/core/2d/image2d.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_IMAGE2D_HH -# define OLENA_CORE_2D_IMAGE2D_HH +#ifndef OLN_CORE_2D_IMAGE2D_HH +# define OLN_CORE_2D_IMAGE2D_HH # include <oln/core/image_entry.hh> # include <oln/core/2d/array2d.hh> @@ -116,4 +116,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_2D_IMAGE2D_HH +#endif // ! OLN_CORE_2D_IMAGE2D_HH Index: oln/core/2d/grid2d.hh =================================================================== --- oln/core/2d/grid2d.hh (revision 577) +++ oln/core/2d/grid2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_GRID2D_HH -# define OLENA_CORE_2D_GRID2D_HH +#ifndef OLN_CORE_2D_GRID2D_HH +# define OLN_CORE_2D_GRID2D_HH # include <mlc/int.hh> # include <oln/core/abstract/grid.hh> @@ -66,4 +66,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_2D_GRID2D_HH +#endif // ! OLN_CORE_2D_GRID2D_HH Index: oln/core/2d/point2d.hh =================================================================== --- oln/core/2d/point2d.hh (revision 577) +++ oln/core/2d/point2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_2D_POINT2D_HH -# define OLENA_CORE_2D_POINT2D_HH +#ifndef OLN_CORE_2D_POINT2D_HH +# define OLN_CORE_2D_POINT2D_HH # include <mlc/int.hh> # include <oln/core/internal/point_nd.hh> @@ -99,4 +99,4 @@ # include <oln/core/2d/dpoint2d.hh> -#endif // ! OLENA_CORE_2D_POINT2D_HH +#endif // ! OLN_CORE_2D_POINT2D_HH Index: oln/core/3d/grid3d.hh =================================================================== --- oln/core/3d/grid3d.hh (revision 577) +++ oln/core/3d/grid3d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_3D_GRID3D_HH -# define OLENA_CORE_3D_GRID3D_HH +#ifndef OLN_CORE_3D_GRID3D_HH +# define OLN_CORE_3D_GRID3D_HH # include <mlc/int.hh> # include <oln/core/abstract/grid.hh> @@ -67,4 +67,4 @@ -#endif // ! OLENA_CORE_3D_GRID3D_HH +#endif // ! OLN_CORE_3D_GRID3D_HH Index: oln/core/case.hh =================================================================== --- oln/core/case.hh (revision 577) +++ oln/core/case.hh (working copy) @@ -30,11 +30,11 @@ Use this file to avoid unnecessary (duplicated) expansions of case_. */ -#ifndef OLENA_CORE_CASE_HH -# define OLENA_CORE_CASE_HH +#ifndef OLN_CORE_CASE_HH +# define OLN_CORE_CASE_HH # include <mlc/case.hh> mlc_case_equipment_for_namespace(oln); -#endif // ! OLENA_CORE_CASE_HH +#endif // ! OLN_CORE_CASE_HH Index: oln/core/gen/topo_lbbox.hh =================================================================== --- oln/core/gen/topo_lbbox.hh (revision 577) +++ oln/core/gen/topo_lbbox.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_TOPO_LBBOX_HH -# define OLENA_CORE_GEN_TOPO_LBBOX_HH +#ifndef OLN_CORE_GEN_TOPO_LBBOX_HH +# define OLN_CORE_GEN_TOPO_LBBOX_HH # include <oln/core/gen/bbox.hh> # include <oln/core/topology_entry.hh> @@ -113,4 +113,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_TOPO_LBBOX_HH +#endif // ! OLN_CORE_GEN_TOPO_LBBOX_HH Index: oln/core/gen/bbox.hh =================================================================== --- oln/core/gen/bbox.hh (revision 577) +++ oln/core/gen/bbox.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_BBOX_HH -# define OLENA_CORE_GEN_BBOX_HH +#ifndef OLN_CORE_GEN_BBOX_HH +# define OLN_CORE_GEN_BBOX_HH # include <oln/core/point_set_entry.hh> # include <oln/core/abstract/point.hh> @@ -222,4 +222,4 @@ # include <oln/core/gen/bbox_bkd_piter.hh> -#endif // ! OLENA_CORE_GEN_BBOX_HH +#endif // ! OLN_CORE_GEN_BBOX_HH Index: oln/core/gen/topo_bbox.hh =================================================================== --- oln/core/gen/topo_bbox.hh (revision 577) +++ oln/core/gen/topo_bbox.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_TOPO_BBOX_HH -# define OLENA_CORE_GEN_TOPO_BBOX_HH +#ifndef OLN_CORE_GEN_TOPO_BBOX_HH +# define OLN_CORE_GEN_TOPO_BBOX_HH # include <oln/core/gen/bbox.hh> # include <oln/core/topology_entry.hh> @@ -109,4 +109,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_TOPO_BBOX_HH +#endif // ! OLN_CORE_GEN_TOPO_BBOX_HH Index: oln/core/gen/neighb.hh =================================================================== --- oln/core/gen/neighb.hh (revision 577) +++ oln/core/gen/neighb.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_NEIGHB_HH -# define OLENA_CORE_GEN_NEIGHB_HH +#ifndef OLN_CORE_GEN_NEIGHB_HH +# define OLN_CORE_GEN_NEIGHB_HH # include <set> # include <vector> @@ -120,4 +120,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_NEIGHB_HH +#endif // ! OLN_CORE_GEN_NEIGHB_HH Index: oln/core/gen/fwd_piter_bbox.hh =================================================================== --- oln/core/gen/fwd_piter_bbox.hh (revision 577) +++ oln/core/gen/fwd_piter_bbox.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_FWD_PITER_BBOX_HH -# define OLENA_CORE_GEN_FWD_PITER_BBOX_HH +#ifndef OLN_CORE_GEN_FWD_PITER_BBOX_HH +# define OLN_CORE_GEN_FWD_PITER_BBOX_HH # include <oln/core/abstract/topology.hh> # include <oln/core/internal/bbox_fwd_piter.hh> @@ -111,4 +111,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_FWD_PITER_BBOX_HH +#endif // ! OLN_CORE_GEN_FWD_PITER_BBOX_HH Index: oln/core/gen/bbox_fwd_piter.hh =================================================================== --- oln/core/gen/bbox_fwd_piter.hh (revision 577) +++ oln/core/gen/bbox_fwd_piter.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_BBOX_FWD_PITER_HH -# define OLENA_CORE_GEN_BBOX_FWD_PITER_HH +#ifndef OLN_CORE_GEN_BBOX_FWD_PITER_HH +# define OLN_CORE_GEN_BBOX_FWD_PITER_HH # include <oln/core/internal/bbox_fwd_piter.hh> @@ -80,4 +80,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_BBOX_FWD_PITER_HH +#endif // ! OLN_CORE_GEN_BBOX_FWD_PITER_HH Index: oln/core/gen/bbox_bkd_piter.hh =================================================================== --- oln/core/gen/bbox_bkd_piter.hh (revision 577) +++ oln/core/gen/bbox_bkd_piter.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_BBOX_BKD_PITER_HH -# define OLENA_CORE_GEN_BBOX_BKD_PITER_HH +#ifndef OLN_CORE_GEN_BBOX_BKD_PITER_HH +# define OLN_CORE_GEN_BBOX_BKD_PITER_HH # include <oln/core/internal/bbox_bkd_piter.hh> @@ -80,4 +80,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_BBOX_BKD_PITER_HH +#endif // ! OLN_CORE_GEN_BBOX_BKD_PITER_HH Index: oln/core/gen/bkd_piter_bbox.hh =================================================================== --- oln/core/gen/bkd_piter_bbox.hh (revision 577) +++ oln/core/gen/bkd_piter_bbox.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_BKD_PITER_BBOX_HH -# define OLENA_CORE_GEN_BKD_PITER_BBOX_HH +#ifndef OLN_CORE_GEN_BKD_PITER_BBOX_HH +# define OLN_CORE_GEN_BKD_PITER_BBOX_HH # include <oln/core/abstract/topology.hh> # include <oln/core/internal/bbox_bkd_piter.hh> @@ -111,4 +111,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_BKD_PITER_BBOX_HH +#endif // ! OLN_CORE_GEN_BKD_PITER_BBOX_HH Index: oln/core/gen/topo_add_nbh.hh =================================================================== --- oln/core/gen/topo_add_nbh.hh (revision 577) +++ oln/core/gen/topo_add_nbh.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_TOPO_ADD_NBH_HH -# define OLENA_CORE_GEN_TOPO_ADD_NBH_HH +#ifndef OLN_CORE_GEN_TOPO_ADD_NBH_HH +# define OLN_CORE_GEN_TOPO_ADD_NBH_HH # include <oln/core/internal/topology_morpher.hh> @@ -99,4 +99,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_TOPO_ADD_NBH_HH +#endif // ! OLN_CORE_GEN_TOPO_ADD_NBH_HH Index: oln/core/gen/mapimage.hh =================================================================== --- oln/core/gen/mapimage.hh (revision 577) +++ oln/core/gen/mapimage.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_MAPIMAGE_HH -# define OLENA_CORE_GEN_MAPIMAGE_HH +#ifndef OLN_CORE_GEN_MAPIMAGE_HH +# define OLN_CORE_GEN_MAPIMAGE_HH # include <oln/core/image_entry.hh> # include <oln/core/gen/topo_bbox.hh> @@ -120,4 +120,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_MAPIMAGE_HH +#endif // ! OLN_CORE_GEN_MAPIMAGE_HH Index: oln/core/internal/topology_morpher.hh =================================================================== --- oln/core/internal/topology_morpher.hh (revision 577) +++ oln/core/internal/topology_morpher.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_INTERNAL_TOPOLOGY_MORPHER_HH -# define OLENA_CORE_INTERNAL_TOPOLOGY_MORPHER_HH +#ifndef OLN_CORE_INTERNAL_TOPOLOGY_MORPHER_HH +# define OLN_CORE_INTERNAL_TOPOLOGY_MORPHER_HH # include <oln/core/topology_entry.hh> @@ -74,4 +74,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_INTERNAL_TOPOLOGY_MORPHER_HH +#endif // ! OLN_CORE_INTERNAL_TOPOLOGY_MORPHER_HH Index: oln/core/internal/point_nd.hh =================================================================== --- oln/core/internal/point_nd.hh (revision 577) +++ oln/core/internal/point_nd.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_INTERNAL_POINT_ND_HH -# define OLENA_CORE_INTERNAL_POINT_ND_HH +#ifndef OLN_CORE_INTERNAL_POINT_ND_HH +# define OLN_CORE_INTERNAL_POINT_ND_HH # include <xtd/vec.hh> # include <xtd/optraits.hh> @@ -210,4 +210,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_INTERNAL_POINT_ND_HH +#endif // ! OLN_CORE_INTERNAL_POINT_ND_HH Index: oln/core/internal/bbox_bkd_piter.hh =================================================================== --- oln/core/internal/bbox_bkd_piter.hh (revision 577) +++ oln/core/internal/bbox_bkd_piter.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_INTERNAL_BBOX_BKD_PITER_HH -# define OLENA_CORE_INTERNAL_BBOX_BKD_PITER_HH +#ifndef OLN_CORE_INTERNAL_BBOX_BKD_PITER_HH +# define OLN_CORE_INTERNAL_BBOX_BKD_PITER_HH # include <oln/core/abstract/iterator_on_points.hh> # include <oln/core/abstract/point.hh> @@ -134,4 +134,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_INTERNAL_BBOX_BKD_PITER_HH +#endif // ! OLN_CORE_INTERNAL_BBOX_BKD_PITER_HH Index: oln/core/internal/bbox_fwd_piter.hh =================================================================== --- oln/core/internal/bbox_fwd_piter.hh (revision 577) +++ oln/core/internal/bbox_fwd_piter.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_INTERNAL_BBOX_FWD_PITER_HH -# define OLENA_CORE_INTERNAL_BBOX_FWD_PITER_HH +#ifndef OLN_CORE_INTERNAL_BBOX_FWD_PITER_HH +# define OLN_CORE_INTERNAL_BBOX_FWD_PITER_HH # include <oln/core/abstract/iterator_on_points.hh> # include <oln/core/abstract/point.hh> @@ -134,4 +134,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_INTERNAL_BBOX_FWD_PITER_HH +#endif // ! OLN_CORE_INTERNAL_BBOX_FWD_PITER_HH Index: oln/core/internal/dpoint_nd.hh =================================================================== --- oln/core/internal/dpoint_nd.hh (revision 577) +++ oln/core/internal/dpoint_nd.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_INTERNAL_DPOINT_ND_HH -# define OLENA_CORE_INTERNAL_DPOINT_ND_HH +#ifndef OLN_CORE_INTERNAL_DPOINT_ND_HH +# define OLN_CORE_INTERNAL_DPOINT_ND_HH # include <mlc/value.hh> # include <xtd/vec.hh> @@ -135,4 +135,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_INTERNAL_DPOINT_ND_HH +#endif // ! OLN_CORE_INTERNAL_DPOINT_ND_HH Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 577) +++ oln/basics2d.hh (working copy) @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_BASICS2D_HH -# define OLENA_BASICS2D_HH +#ifndef OLN_BASICS2D_HH +# define OLN_BASICS2D_HH # include <oln/core/2d/aliases.hh> @@ -58,4 +58,4 @@ # include <oln/core/2d/image2d.hh> -#endif // ! OLENA_BASICS2D_HH +#endif // ! OLN_BASICS2D_HH Index: oln/morpher/identity.hh =================================================================== --- oln/morpher/identity.hh (revision 577) +++ oln/morpher/identity.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_MORPHER_IDENTITY -# define OLENA_MORPHER_IDENTITY +#ifndef OLN_MORPHER_IDENTITY +# define OLN_MORPHER_IDENTITY # include <oln/morpher/internal/image_extension.hh> # include <oln/morpher/tags.hh> @@ -85,4 +85,4 @@ } // end of namespace oln -#endif // ! OLENA_MORPHER_IDENTITY +#endif // ! OLN_MORPHER_IDENTITY Index: oln/morpher/internal/image_extension.hh =================================================================== --- oln/morpher/internal/image_extension.hh (revision 577) +++ oln/morpher/internal/image_extension.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_MORPHER_INTERNAL_IMAGE_EXTENSION -# define OLENA_MORPHER_INTERNAL_IMAGE_EXTENSION +#ifndef OLN_MORPHER_INTERNAL_IMAGE_EXTENSION +# define OLN_MORPHER_INTERNAL_IMAGE_EXTENSION # include <oln/core/image_entry.hh> @@ -98,4 +98,4 @@ } // end of namespace oln -#endif // ! OLENA_MORPHER_INTERNAL_IMAGE_EXTENSION +#endif // ! OLN_MORPHER_INTERNAL_IMAGE_EXTENSION Index: oln/morpher/tags.hh =================================================================== --- oln/morpher/tags.hh (revision 577) +++ oln/morpher/tags.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_MORPHER_TAGS -# define OLENA_MORPHER_TAGS +#ifndef OLN_MORPHER_TAGS +# define OLN_MORPHER_TAGS namespace oln @@ -46,4 +46,4 @@ } // end of namespace oln -#endif // ! OLENA_MORPHER_TAGS +#endif // ! OLN_MORPHER_TAGS Index: oln/morpher/add_neighborhood.hh =================================================================== --- oln/morpher/add_neighborhood.hh (revision 577) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_MORPHER_ADD_NEIGHBORHOOD -# define OLENA_MORPHER_ADD_NEIGHBORHOOD +#ifndef OLN_MORPHER_ADD_NEIGHBORHOOD +# define OLN_MORPHER_ADD_NEIGHBORHOOD # include <oln/morpher/internal/image_extension.hh> # include <oln/morpher/tags.hh> @@ -123,4 +123,4 @@ } // end of namespace oln -#endif // ! OLENA_MORPHER_ADD_NEIGHBORHOOD +#endif // ! OLN_MORPHER_ADD_NEIGHBORHOOD

1 0