Un peu de cleanup de fait jamais de mal.
Index: integre/ChangeLog from Nicolas Burrus burrus_n@lrde.epita.fr
* ntg/real/optraits_scalar_defs.hh: Rename as... * ntg/real/optraits_real_defs.hh: ... this. * ntg/real/optraits_scalar.hh: Rename as... * ntg/real/optraits_real.hh: ... this.
* ntg/core/behavior.hh: Rename as... * ntg/real/behavior.hh: ... this.
* ntg/real/int_s.hh, * ntg/real/int_u.hh, * ntg/real/optraits_builtin_int.hh, * ntg/real/typetraits_builtin_int.hh, * ntg/Makefile.am, * ntg/basics.hh, * ntg/real/builtin_float.hh, * ntg/enum/builtin_bool.hh, * ntg/real/range.hh: Adjust consequently.
Index: integre/ntg/real/behavior.hh --- integre/ntg/core/behavior.hh Mon, 01 Sep 2003 19:55:03 +0200 burrus_n (oln/g/31_behaviour. 1.13.1.15 640) +++ integre/ntg/real/behavior.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/31_behaviour. 1.13.1.16 640) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License.
-#ifndef NTG_CORE_BEHAVIOUR_HH -# define NTG_CORE_BEHAVIOUR_HH +#ifndef NTG_REAL_BEHAVIOUR_HH +# define NTG_REAL_BEHAVIOUR_HH
/* Behaviors for data_types int_u, int_s, etc ... @@ -45,7 +45,7 @@ # include <ntg/core/type_traits.hh> # include <ntg/core/value.hh> # include <ntg/core/internal/macros.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/real_value.hh> # include <ntg/utils/debug.hh> # include <ntg/utils/cast.hh> @@ -376,4 +376,4 @@
} // end of ntg.
-#endif // !NTG_CORE_BEHAVIOUR_HH +#endif // !NTG_REAL_BEHAVIOUR_HH Index: integre/ntg/real/int_s.hh --- integre/ntg/real/int_s.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/g/24_int_s.hh 1.16.1.16 640) +++ integre/ntg/real/int_s.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/24_int_s.hh 1.16.1.17 640) @@ -29,7 +29,7 @@ # define NTG_CORE_INT_S_HH
# include <ntg/basics.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/real_value.hh> # include <ntg/bin.hh>
Index: integre/ntg/real/int_u.hh --- integre/ntg/real/int_u.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/g/23_int_u.hh 1.19.1.16 640) +++ integre/ntg/real/int_u.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/23_int_u.hh 1.19.1.17 640) @@ -29,7 +29,7 @@ # define NTG_REAL_INT_U_HH
# include <ntg/basics.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/real_value.hh> # include <ntg/bin.hh>
Index: integre/ntg/real/optraits_builtin_int.hh --- integre/ntg/real/optraits_builtin_int.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/g/18_optraits_b 1.6.1.8 640) +++ integre/ntg/real/optraits_builtin_int.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/18_optraits_b 1.6.1.9 640) @@ -33,7 +33,7 @@ */
# include <ntg/config/system.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/typetraits_builtin_int.hh>
// FIXME: this should be included by system.hh. Index: integre/ntg/real/optraits_real_defs.hh --- integre/ntg/real/optraits_scalar_defs.hh Mon, 01 Sep 2003 19:55:03 +0200 burrus_n (oln/g/11_optraits_s 1.14 640) +++ integre/ntg/real/optraits_real_defs.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/11_optraits_s 1.15 640) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License.
-#ifndef NTG_OPTRAITS_SCALAR_DEFS_HH -# define NTG_OPTRAITS_SCALAR_DEFS_HH +#ifndef NTG_OPTRAITS_REAL_DEFS_HH +# define NTG_OPTRAITS_REAL_DEFS_HH
// // macros used in optraits_scalar definition @@ -169,4 +169,4 @@ return result; \ }
-#endif // ndef NTG_OPTRAITS_SCALAR_DEFS_HH +#endif // ndef NTG_OPTRAITS_REAL_DEFS_HH Index: integre/ntg/real/optraits_real.hh --- integre/ntg/real/optraits_scalar.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/g/12_optraits_s 1.11.1.8 640) +++ integre/ntg/real/optraits_real.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/12_optraits_s 1.11.1.9 640) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License.
-#ifndef NTG_OPTRAITS_SCALAR_HH_ -# define NTG_OPTRAITS_SCALAR_HH_ +#ifndef NTG_OPTRAITS_REAL_HH_ +# define NTG_OPTRAITS_REAL_HH_
# include <cmath>
@@ -43,7 +43,7 @@ # include <ntg/core/macros.hh>
// macros definitions -# include <ntg/real/optraits_scalar_defs.hh> +# include <ntg/real/optraits_real_defs.hh>
namespace ntg {
@@ -146,4 +146,4 @@
} // end of ntg
-#endif // ndef NTG_OPTRAITS_SCALAR_HH_ +#endif // ndef NTG_OPTRAITS_REAL_HH_ Index: integre/ntg/real/typetraits_builtin_int.hh --- integre/ntg/real/typetraits_builtin_int.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/g/3_typetraits 1.7.1.11 640) +++ integre/ntg/real/typetraits_builtin_int.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/3_typetraits 1.7.1.12 640) @@ -28,7 +28,7 @@ #ifndef NTG_REAL_TYPETRAITS_BUILTIN_INT_HH # define NTG_REAL_TYPETRAITS_BUILTIN_INT_HH
-# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/predecls.hh> # include <ntg/core/type_traits.hh>
Index: integre/ntg/Makefile.am --- integre/ntg/Makefile.am Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/q/36_Makefile.a 1.8 640) +++ integre/ntg/Makefile.am Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/q/36_Makefile.a 1.9 640) @@ -18,7 +18,7 @@ config/math.hh \ config/system.hh \ core/abstract_hierarchy.hh \ - core/behavior.hh \ + real/behavior.hh \ core/contract.hh \ core/internal/global_ops.hh \ core/internal/global_ops_defs.hh \ @@ -46,8 +46,8 @@ real/int_s.hh \ real/int_u.hh \ real/optraits_builtin_int.hh \ - real/optraits_scalar.hh \ - real/optraits_scalar_defs.hh \ + real/optraits_real.hh \ + real/optraits_real_defs.hh \ real/range.hh \ real/real_value.hh \ real/typetraits_builtin_int.hh \ Index: integre/ntg/basics.hh --- integre/ntg/basics.hh Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/s/21_basics.hh 1.3 640) +++ integre/ntg/basics.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/21_basics.hh 1.4 640) @@ -38,7 +38,7 @@ # include <ntg/core/predecls.hh>
# include <ntg/core/abstract_hierarchy.hh> -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/contract.hh> # include <ntg/core/interval.hh> # include <ntg/real/builtin_properties.hh> Index: integre/ntg/real/builtin_float.hh --- integre/ntg/real/builtin_float.hh Mon, 21 Jul 2003 17:51:12 +0200 burrus_n (oln/s/47_builtin_fl 1.2 640) +++ integre/ntg/real/builtin_float.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/47_builtin_fl 1.3 640) @@ -29,11 +29,11 @@ # define NTG_REAL_BUILTIN_FLOAT_HH
# include <ntg/config/system.hh> -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/internal/global_ops_traits.hh> # include <ntg/core/internal/traits.hh> # include <ntg/real/builtin_properties.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/core/predecls.hh>
# include <mlc/cmp.hh> Index: integre/ntg/enum/builtin_bool.hh --- integre/ntg/enum/builtin_bool.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/s/50_builtin_bo 1.4 640) +++ integre/ntg/enum/builtin_bool.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/50_builtin_bo 1.5 640) @@ -29,7 +29,7 @@ # define NTG_ENUM_BUILTIN_BOOL_HH
# include <ntg/core/abstract_hierarchy.hh> -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/predecls.hh> # include <ntg/core/type_traits.hh>
Index: integre/ntg/real/range.hh --- integre/ntg/real/range.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/t/16_range.hh 1.3 640) +++ integre/ntg/real/range.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/t/16_range.hh 1.4 640) @@ -32,7 +32,7 @@
# include <ntg/basics.hh> # include <ntg/core/internal/macros.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh>
# include <string> # include <sstream>
-
Nicolas Burrus