From 046d30f4e00a67db11604081259956883bc0ec1e Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 18 Jun 2007 17:22:53 +0000 Subject: [PATCH] stl_list.h: Rename guard macro consistently with file name. 2007-06-18 Paolo Carlini * include/bits/stl_list.h: Rename guard macro consistently with file name. * include/bits/stl_algobase.h: Likewise. * include/bits/stl_map.h: Likewise. * include/bits/stl_queue.h: Likewise. * include/bits/stl_set.h: Likewise. * include/bits/stl_stack.h: Likewise. * include/bits/stl_iterator_base_types.h: Likewise. * include/bits/stl_multimap.h: Likewise. * include/bits/stl_pair.h: Likewise. * include/bits/stl_vector.h: Likewise. * include/bits/stl_deque.h: Likewise. * include/bits/stl_multiset.h: Likewise. * include/bits/stl_iterator_base_funcs.h: Likewise. * include/bits/stl_algo.h: Likewise. * include/bits/stl_iterator.h: Likewise. * include/bits/stl_tempbuf.h: Likewise. * include/bits/stl_bvector.h: Likewise. * include/bits/stl_function.h: Likewise. * include/bits/stl_tree.h: Likewise. From-SVN: r125815 --- libstdc++-v3/ChangeLog | 23 +++++++++++++++++++ libstdc++-v3/include/bits/stl_algo.h | 6 ++--- libstdc++-v3/include/bits/stl_algobase.h | 4 ++-- libstdc++-v3/include/bits/stl_bvector.h | 4 ++-- libstdc++-v3/include/bits/stl_deque.h | 6 ++--- libstdc++-v3/include/bits/stl_function.h | 9 ++++---- libstdc++-v3/include/bits/stl_iterator.h | 4 ++-- .../include/bits/stl_iterator_base_funcs.h | 8 +++---- .../include/bits/stl_iterator_base_types.h | 6 ++--- libstdc++-v3/include/bits/stl_list.h | 6 ++--- libstdc++-v3/include/bits/stl_map.h | 6 ++--- libstdc++-v3/include/bits/stl_multimap.h | 9 ++++---- libstdc++-v3/include/bits/stl_multiset.h | 9 ++++---- libstdc++-v3/include/bits/stl_pair.h | 9 ++++---- libstdc++-v3/include/bits/stl_queue.h | 8 +++---- libstdc++-v3/include/bits/stl_set.h | 9 ++++---- libstdc++-v3/include/bits/stl_stack.h | 8 +++---- libstdc++-v3/include/bits/stl_tempbuf.h | 6 ++--- libstdc++-v3/include/bits/stl_tree.h | 4 ++-- libstdc++-v3/include/bits/stl_vector.h | 6 ++--- 20 files changed, 89 insertions(+), 61 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 82e860dbe7a..1725e68143b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,26 @@ +2007-06-18 Paolo Carlini + + * include/bits/stl_list.h: Rename guard macro consistently with + file name. + * include/bits/stl_algobase.h: Likewise. + * include/bits/stl_map.h: Likewise. + * include/bits/stl_queue.h: Likewise. + * include/bits/stl_set.h: Likewise. + * include/bits/stl_stack.h: Likewise. + * include/bits/stl_iterator_base_types.h: Likewise. + * include/bits/stl_multimap.h: Likewise. + * include/bits/stl_pair.h: Likewise. + * include/bits/stl_vector.h: Likewise. + * include/bits/stl_deque.h: Likewise. + * include/bits/stl_multiset.h: Likewise. + * include/bits/stl_iterator_base_funcs.h: Likewise. + * include/bits/stl_algo.h: Likewise. + * include/bits/stl_iterator.h: Likewise. + * include/bits/stl_tempbuf.h: Likewise. + * include/bits/stl_bvector.h: Likewise. + * include/bits/stl_function.h: Likewise. + * include/bits/stl_tree.h: Likewise. + 2007-06-17 Nathan Sidwell * config/cpu/m68k/atomicity.h: Use __mcfisaa__, __mcfisaaplus__, diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index fe4024a918b..96b6602f587 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _ALGO_H -#define _ALGO_H 1 +#ifndef _STL_ALGO_H +#define _STL_ALGO_H 1 #include #include // for _Temporary_buffer @@ -5516,4 +5516,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _ALGO_H */ +#endif /* _STL_ALGO_H */ diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index f9f58373aff..fd9592af688 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _ALGOBASE_H -#define _ALGOBASE_H 1 +#ifndef _STL_ALGOBASE_H +#define _STL_ALGOBASE_H 1 #include #include diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index be0ec9075d2..a792b744c1f 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _BVECTOR_H -#define _BVECTOR_H 1 +#ifndef _STL_BVECTOR_H +#define _STL_BVECTOR_H 1 _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 0c7d7582557..890afc58d41 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _DEQUE_H -#define _DEQUE_H 1 +#ifndef _STL_DEQUE_H +#define _STL_DEQUE_H 1 #include #include @@ -1600,4 +1600,4 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _DEQUE_H */ +#endif /* _STL_DEQUE_H */ diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h index db213dc0a92..9867abe95f4 100644 --- a/libstdc++-v3/include/bits/stl_function.h +++ b/libstdc++-v3/include/bits/stl_function.h @@ -1,6 +1,7 @@ // Functor implementations -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -58,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _FUNCTION_H -#define _FUNCTION_H 1 +#ifndef _STL_FUNCTION_H +#define _STL_FUNCTION_H 1 _GLIBCXX_BEGIN_NAMESPACE(std) @@ -752,4 +753,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _FUNCTION_H */ +#endif /* _STL_FUNCTION_H */ diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 06aa105ece4..d7c09260234 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -63,8 +63,8 @@ * supporting functions and overloaded operators. */ -#ifndef _ITERATOR_H -#define _ITERATOR_H 1 +#ifndef _STL_ITERATOR_H +#define _STL_ITERATOR_H 1 #include #include diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h index 79fb6675fa2..dbdca22e6e9 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h @@ -1,6 +1,6 @@ // Functions used by iterators -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -62,8 +62,8 @@ * functions, such as distance() and advance(). */ -#ifndef _ITERATOR_BASE_FUNCS_H -#define _ITERATOR_BASE_FUNCS_H 1 +#ifndef _STL_ITERATOR_BASE_FUNCS_H +#define _STL_ITERATOR_BASE_FUNCS_H 1 #pragma GCC system_header #include @@ -179,4 +179,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _ITERATOR_BASE_FUNCS_H */ +#endif /* _STL_ITERATOR_BASE_FUNCS_H */ diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h index 1b746692eeb..785abefdd34 100644 --- a/libstdc++-v3/include/bits/stl_iterator_base_types.h +++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h @@ -62,8 +62,8 @@ * such as iterator_traits and struct iterator. */ -#ifndef _ITERATOR_BASE_TYPES_H -#define _ITERATOR_BASE_TYPES_H 1 +#ifndef _STL_ITERATOR_BASE_TYPES_H +#define _STL_ITERATOR_BASE_TYPES_H 1 #pragma GCC system_header @@ -170,5 +170,5 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _ITERATOR_BASE_TYPES_H */ +#endif /* _STL_ITERATOR_BASE_TYPES_H */ diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 55f3208297d..44327dab4e6 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _LIST_H -#define _LIST_H 1 +#ifndef _STL_LIST_H +#define _STL_LIST_H 1 #include @@ -1258,5 +1258,5 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _LIST_H */ +#endif /* _STL_LIST_H */ diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index e30eac28239..741b9e6c16f 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _MAP_H -#define _MAP_H 1 +#ifndef _STL_MAP_H +#define _STL_MAP_H 1 #include #include @@ -737,4 +737,4 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _MAP_H */ +#endif /* _STL_MAP_H */ diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index 554035a6a20..67d81cbd7c7 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -1,6 +1,7 @@ // Multimap implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -58,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _MULTIMAP_H -#define _MULTIMAP_H 1 +#ifndef _STL_MULTIMAP_H +#define _STL_MULTIMAP_H 1 #include @@ -667,4 +668,4 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _MULTIMAP_H */ +#endif /* _STL_MULTIMAP_H */ diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index 3979cd6d7db..3f88e534893 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -1,6 +1,7 @@ // Multiset implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -58,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _MULTISET_H -#define _MULTISET_H 1 +#ifndef _STL_MULTISET_H +#define _STL_MULTISET_H 1 #include @@ -562,4 +563,4 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _MULTISET_H */ +#endif /* _STL_MULTISET_H */ diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index b4bb00c26e1..bdc6723f748 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -1,6 +1,7 @@ // Pair implementation -*- C++ -*- -// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -58,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _PAIR_H -#define _PAIR_H 1 +#ifndef _STL_PAIR_H +#define _STL_PAIR_H 1 _GLIBCXX_BEGIN_NAMESPACE(std) @@ -146,4 +147,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _PAIR_H */ +#endif /* _STL_PAIR_H */ diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 04e3a7b46e0..469f9ec17be 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -1,6 +1,6 @@ // Queue implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _QUEUE_H -#define _QUEUE_H 1 +#ifndef _STL_QUEUE_H +#define _STL_QUEUE_H 1 #include #include @@ -440,4 +440,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _QUEUE_H */ +#endif /* _STL_QUEUE_H */ diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index 6ee85263b01..d2d8a6d47c4 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -1,6 +1,7 @@ // Set implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -58,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _SET_H -#define _SET_H 1 +#ifndef _STL_SET_H +#define _STL_SET_H 1 #include @@ -575,4 +576,4 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _SET_H */ +#endif /* _STL_SET_H */ diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h index f5b41facb03..4baca258208 100644 --- a/libstdc++-v3/include/bits/stl_stack.h +++ b/libstdc++-v3/include/bits/stl_stack.h @@ -1,6 +1,6 @@ // Stack implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _STACK_H -#define _STACK_H 1 +#ifndef _STL_STACK_H +#define _STL_STACK_H 1 #include #include @@ -258,4 +258,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _STACK_H */ +#endif /* _STL_STACK_H */ diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h index 9cf16203a76..21adc70c9b3 100644 --- a/libstdc++-v3/include/bits/stl_tempbuf.h +++ b/libstdc++-v3/include/bits/stl_tempbuf.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _TEMPBUF_H -#define _TEMPBUF_H 1 +#ifndef _STL_TEMPBUF_H +#define _STL_TEMPBUF_H 1 #include #include @@ -220,5 +220,5 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#endif /* _TEMPBUF_H */ +#endif /* _STL_TEMPBUF_H */ diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h index c0ecddc8f52..8437c9a9952 100644 --- a/libstdc++-v3/include/bits/stl_tree.h +++ b/libstdc++-v3/include/bits/stl_tree.h @@ -61,8 +61,8 @@ * You should not attempt to use it directly. */ -#ifndef _TREE_H -#define _TREE_H 1 +#ifndef _STL_TREE_H +#define _STL_TREE_H 1 #include #include diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 8d1049520c9..c294f4e92f4 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -59,8 +59,8 @@ * You should not attempt to use it directly. */ -#ifndef _VECTOR_H -#define _VECTOR_H 1 +#ifndef _STL_VECTOR_H +#define _STL_VECTOR_H 1 #include #include @@ -1008,4 +1008,4 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) _GLIBCXX_END_NESTED_NAMESPACE -#endif /* _VECTOR_H */ +#endif /* _STL_VECTOR_H */ -- 2.30.2