[Olena-patches] [PATCH 5/5] Normalize header guards.

* src/all_methods.erb.cc, * src/all_methods.erb.hh, * src/data.cc, * src/data.hh, * src/data.hxx, * src/dyn.hh, * src/function.erb.cc, * src/function.erb.hh, * src/function_loader.cc, * src/function_loader.hh, * src/name_of.hh, * src/ruby_stream.cc, * src/ruby_stream.hh, * test/fixtures/my_lib/damien.hh, * test/fixtures/my_lib/damien.hxx: Here. --- dynamic-use-of-static-c++/ChangeLog | 21 ++++++++++++++++++++ dynamic-use-of-static-c++/src/all_methods.erb.cc | 2 +- dynamic-use-of-static-c++/src/all_methods.erb.hh | 2 +- dynamic-use-of-static-c++/src/data.cc | 2 +- dynamic-use-of-static-c++/src/data.hh | 2 +- dynamic-use-of-static-c++/src/data.hxx | 2 +- dynamic-use-of-static-c++/src/dyn.hh | 7 ++--- dynamic-use-of-static-c++/src/function.erb.cc | 6 ++-- dynamic-use-of-static-c++/src/function.erb.hh | 6 ++-- dynamic-use-of-static-c++/src/function_loader.cc | 2 +- dynamic-use-of-static-c++/src/function_loader.hh | 2 +- dynamic-use-of-static-c++/src/name_of.hh | 6 ++-- dynamic-use-of-static-c++/src/ruby_stream.cc | 6 ++-- dynamic-use-of-static-c++/src/ruby_stream.hh | 6 ++-- .../test/fixtures/my_lib/damien.hh | 9 +++---- .../test/fixtures/my_lib/damien.hxx | 11 ++++----- 16 files changed, 55 insertions(+), 37 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index f7e7988..4c5bdb4 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,5 +1,26 @@ 2009-11-03 Roland Levillain <roland@lrde.epita.fr> + Normalize header guards. + + * src/all_methods.erb.cc, + * src/all_methods.erb.hh, + * src/data.cc, + * src/data.hh, + * src/data.hxx, + * src/dyn.hh, + * src/function.erb.cc, + * src/function.erb.hh, + * src/function_loader.cc, + * src/function_loader.hh, + * src/name_of.hh, + * src/ruby_stream.cc, + * src/ruby_stream.hh, + * test/fixtures/my_lib/damien.hh, + * test/fixtures/my_lib/damien.hxx: + Here. + +2009-11-03 Roland Levillain <roland@lrde.epita.fr> + Add missing header guards. * libmd5/md5.hh, diff --git a/dynamic-use-of-static-c++/src/all_methods.erb.cc b/dynamic-use-of-static-c++/src/all_methods.erb.cc index 347ffc6..531d525 100644 --- a/dynamic-use-of-static-c++/src/all_methods.erb.cc +++ b/dynamic-use-of-static-c++/src/all_methods.erb.cc @@ -59,4 +59,4 @@ namespace dyn } -#endif // !DYN_ALL_METHODS_CC +#endif // ! DYN_ALL_METHODS_CC diff --git a/dynamic-use-of-static-c++/src/all_methods.erb.hh b/dynamic-use-of-static-c++/src/all_methods.erb.hh index 948ccdd..a838d3b 100644 --- a/dynamic-use-of-static-c++/src/all_methods.erb.hh +++ b/dynamic-use-of-static-c++/src/all_methods.erb.hh @@ -59,4 +59,4 @@ namespace dyn } -#endif // !DYN_ALL_METHODS_HH +#endif // ! DYN_ALL_METHODS_HH diff --git a/dynamic-use-of-static-c++/src/data.cc b/dynamic-use-of-static-c++/src/data.cc index 127dc87..2912e35 100644 --- a/dynamic-use-of-static-c++/src/data.cc +++ b/dynamic-use-of-static-c++/src/data.cc @@ -150,4 +150,4 @@ dyn::data operator+(const dyn::data& lhs, const dyn::data& rhs) return dyn::internal::operator_plus(lhs, rhs); } -#endif +#endif // ! DYN_DATA_CC diff --git a/dynamic-use-of-static-c++/src/data.hh b/dynamic-use-of-static-c++/src/data.hh index aa8c192..0725464 100644 --- a/dynamic-use-of-static-c++/src/data.hh +++ b/dynamic-use-of-static-c++/src/data.hh @@ -441,4 +441,4 @@ struct dyn_choose_data_proxy<T, (dyn::policy::type)(dyn::policy::is_ref + dyn::p # include "data.hxx" # endif -#endif +#endif // ! DYN_DATA_HH diff --git a/dynamic-use-of-static-c++/src/data.hxx b/dynamic-use-of-static-c++/src/data.hxx index 1ff7886..2990596 100644 --- a/dynamic-use-of-static-c++/src/data.hxx +++ b/dynamic-use-of-static-c++/src/data.hxx @@ -83,4 +83,4 @@ bool operator!=(const dyn::data& lhs, const dyn::data& rhs); bool operator==(const dyn::data& lhs, const dyn::data& rhs); dyn::data operator+(const dyn::data& lhs, const dyn::data& rhs); -#endif +#endif // ! DYN_DATA_HXX diff --git a/dynamic-use-of-static-c++/src/dyn.hh b/dynamic-use-of-static-c++/src/dyn.hh index d12a790..1e7cbf8 100644 --- a/dynamic-use-of-static-c++/src/dyn.hh +++ b/dynamic-use-of-static-c++/src/dyn.hh @@ -23,8 +23,8 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef DYN_HH -# define DYN_HH +#ifndef DYN_DYN_HH +# define DYN_DYN_HH # include "config.hh" @@ -83,5 +83,4 @@ namespace dyn # include "function_loader.hh" -#endif - +#endif // ! DYN_DYN_HH diff --git a/dynamic-use-of-static-c++/src/function.erb.cc b/dynamic-use-of-static-c++/src/function.erb.cc index b83fd7b..93c50b5 100644 --- a/dynamic-use-of-static-c++/src/function.erb.cc +++ b/dynamic-use-of-static-c++/src/function.erb.cc @@ -23,8 +23,8 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef FUNCTION_HXX -#define FUNCTION_HXX +#ifndef DYN_FUNCTION_CC +# define DYN_FUNCTION_CC # include <cassert> # include <string> @@ -69,4 +69,4 @@ namespace dyn } // end of namespace dyn -#endif +#endif // ! DYN_FUNCTION_CC diff --git a/dynamic-use-of-static-c++/src/function.erb.hh b/dynamic-use-of-static-c++/src/function.erb.hh index b814938..c796640 100644 --- a/dynamic-use-of-static-c++/src/function.erb.hh +++ b/dynamic-use-of-static-c++/src/function.erb.hh @@ -23,8 +23,8 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef FUNCTION_HH -#define FUNCTION_HH +#ifndef DYN_FUNCTION_HH +# define DYN_FUNCTION_HH # include <cassert> # include <string> @@ -85,4 +85,4 @@ namespace dyn } // end of namespace dyn -#endif +#endif // ! DYN_FUNCTION_HH diff --git a/dynamic-use-of-static-c++/src/function_loader.cc b/dynamic-use-of-static-c++/src/function_loader.cc index 0b300be..9dbc138 100644 --- a/dynamic-use-of-static-c++/src/function_loader.cc +++ b/dynamic-use-of-static-c++/src/function_loader.cc @@ -587,4 +587,4 @@ namespace dyn { } // end of namespace dyn -#endif +#endif // ! DYN_FUNCTION_LOADER_CC diff --git a/dynamic-use-of-static-c++/src/function_loader.hh b/dynamic-use-of-static-c++/src/function_loader.hh index 27edb37..b57d9b5 100644 --- a/dynamic-use-of-static-c++/src/function_loader.hh +++ b/dynamic-use-of-static-c++/src/function_loader.hh @@ -51,4 +51,4 @@ namespace dyn { } // end of namespace dyn -#endif +#endif // ! DYN_FUNCTION_LOADER_HH diff --git a/dynamic-use-of-static-c++/src/name_of.hh b/dynamic-use-of-static-c++/src/name_of.hh index dca878b..ad688ff 100644 --- a/dynamic-use-of-static-c++/src/name_of.hh +++ b/dynamic-use-of-static-c++/src/name_of.hh @@ -23,8 +23,8 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef NAME_OF -# define NAME_OF +#ifndef DYN_NAME_OF_HH +# define DYN_NAME_OF_HH # include <typeinfo> @@ -207,4 +207,4 @@ mlc_set_name(std::ostringstream); # endif -#endif +#endif // ! DYN_NAME_OF_HH diff --git a/dynamic-use-of-static-c++/src/ruby_stream.cc b/dynamic-use-of-static-c++/src/ruby_stream.cc index 04a9d16..e7f8abe 100644 --- a/dynamic-use-of-static-c++/src/ruby_stream.cc +++ b/dynamic-use-of-static-c++/src/ruby_stream.cc @@ -23,8 +23,8 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef RUBY_STREAM_CC -# define RUBY_STREAM_CC +#ifndef DYN_RUBY_STREAM_CC +# define DYN_RUBY_STREAM_CC # include "ruby_stream.hh" @@ -33,4 +33,4 @@ namespace ruby eval_type eval; } -#endif +#endif // ! DYN_RUBY_STREAM_CC diff --git a/dynamic-use-of-static-c++/src/ruby_stream.hh b/dynamic-use-of-static-c++/src/ruby_stream.hh index 12c9455..f327d20 100644 --- a/dynamic-use-of-static-c++/src/ruby_stream.hh +++ b/dynamic-use-of-static-c++/src/ruby_stream.hh @@ -23,8 +23,8 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef RUBY_STREAM_HH -#define RUBY_STREAM_HH +#ifndef DYN_RUBY_STREAM_HH +# define DYN_RUBY_STREAM_HH // #define DEBUG_RUBY_STREAM @@ -122,4 +122,4 @@ ruby::stream& operator<< (ruby::stream& stream, const T& obj) return stream; } -#endif +#endif // ! DYN_RUBY_STREAM_HH diff --git a/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hh b/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hh index 63dc041..c2222a8 100644 --- a/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hh +++ b/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hh @@ -23,10 +23,10 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef DAMIEN_HH -#define DAMIEN_HH +#ifndef MY_LIB_DAMIEN_HH +# define MY_LIB_DAMIEN_HH -#include <iostream> +# include <iostream> struct up { @@ -82,5 +82,4 @@ void print(const T&); template <typename T> T sqr(const T&); -#endif - +#endif // ! MY_LIB_DAMIEN_HH diff --git a/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hxx b/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hxx index 0202a44..8269ac3 100644 --- a/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hxx +++ b/dynamic-use-of-static-c++/test/fixtures/my_lib/damien.hxx @@ -23,11 +23,11 @@ exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#ifndef DAMIEN_HXX -#define DAMIEN_HXX +#ifndef MY_LIB_DAMIEN_HXX +# define MY_LIB_DAMIEN_HXX -#include <iostream> -#include "damien.hh" +# include <iostream> +# include "damien.hh" template <typename T> const T* down<T>::get_t() const { return &t_; } @@ -78,5 +78,4 @@ T sqr(const T& a) } -#endif - +#endif // ! MY_LIB_DAMIEN_HXX -- 1.6.5