This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Rename some guard macros
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 18 Jun 2007 19:24:38 +0200
- Subject: [v3] Rename some guard macros
Hi,
noticed a few days ago, just consistency, tested x86-linux.
Paolo.
///////////////
2007-06-18 Paolo Carlini <pcarlini@suse.de>
* 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.
Index: include/bits/stl_list.h
===================================================================
--- include/bits/stl_list.h (revision 125775)
+++ include/bits/stl_list.h (working copy)
@@ -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 <bits/concept_check.h>
@@ -1258,5 +1258,5 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _LIST_H */
+#endif /* _STL_LIST_H */
Index: include/bits/stl_algobase.h
===================================================================
--- include/bits/stl_algobase.h (revision 125775)
+++ include/bits/stl_algobase.h (working copy)
@@ -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 <bits/c++config.h>
#include <cstddef>
Index: include/bits/stl_map.h
===================================================================
--- include/bits/stl_map.h (revision 125775)
+++ include/bits/stl_map.h (working copy)
@@ -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 <bits/functexcept.h>
#include <bits/concept_check.h>
@@ -737,4 +737,4 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _MAP_H */
+#endif /* _STL_MAP_H */
Index: include/bits/stl_queue.h
===================================================================
--- include/bits/stl_queue.h (revision 125775)
+++ include/bits/stl_queue.h (working copy)
@@ -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 <bits/concept_check.h>
#include <debug/debug.h>
@@ -440,4 +440,4 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _QUEUE_H */
+#endif /* _STL_QUEUE_H */
Index: include/bits/stl_set.h
===================================================================
--- include/bits/stl_set.h (revision 125775)
+++ include/bits/stl_set.h (working copy)
@@ -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 <bits/concept_check.h>
@@ -575,4 +576,4 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _SET_H */
+#endif /* _STL_SET_H */
Index: include/bits/stl_stack.h
===================================================================
--- include/bits/stl_stack.h (revision 125775)
+++ include/bits/stl_stack.h (working copy)
@@ -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 <bits/concept_check.h>
#include <debug/debug.h>
@@ -258,4 +258,4 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _STACK_H */
+#endif /* _STL_STACK_H */
Index: include/bits/stl_iterator_base_types.h
===================================================================
--- include/bits/stl_iterator_base_types.h (revision 125775)
+++ include/bits/stl_iterator_base_types.h (working copy)
@@ -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_END_NAMESPACE
-#endif /* _ITERATOR_BASE_TYPES_H */
+#endif /* _STL_ITERATOR_BASE_TYPES_H */
Index: include/bits/stl_multimap.h
===================================================================
--- include/bits/stl_multimap.h (revision 125775)
+++ include/bits/stl_multimap.h (working copy)
@@ -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 <bits/concept_check.h>
@@ -667,4 +668,4 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _MULTIMAP_H */
+#endif /* _STL_MULTIMAP_H */
Index: include/bits/stl_pair.h
===================================================================
--- include/bits/stl_pair.h (revision 125775)
+++ include/bits/stl_pair.h (working copy)
@@ -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_END_NAMESPACE
-#endif /* _PAIR_H */
+#endif /* _STL_PAIR_H */
Index: include/bits/stl_vector.h
===================================================================
--- include/bits/stl_vector.h (revision 125775)
+++ include/bits/stl_vector.h (working copy)
@@ -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 <bits/stl_iterator_base_funcs.h>
#include <bits/functexcept.h>
@@ -1008,4 +1008,4 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _VECTOR_H */
+#endif /* _STL_VECTOR_H */
Index: include/bits/stl_deque.h
===================================================================
--- include/bits/stl_deque.h (revision 125775)
+++ include/bits/stl_deque.h (working copy)
@@ -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 <bits/concept_check.h>
#include <bits/stl_iterator_base_types.h>
@@ -1600,4 +1600,4 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _DEQUE_H */
+#endif /* _STL_DEQUE_H */
Index: include/bits/stl_multiset.h
===================================================================
--- include/bits/stl_multiset.h (revision 125775)
+++ include/bits/stl_multiset.h (working copy)
@@ -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 <bits/concept_check.h>
@@ -562,4 +563,4 @@
_GLIBCXX_END_NESTED_NAMESPACE
-#endif /* _MULTISET_H */
+#endif /* _STL_MULTISET_H */
Index: include/bits/stl_iterator_base_funcs.h
===================================================================
--- include/bits/stl_iterator_base_funcs.h (revision 125775)
+++ include/bits/stl_iterator_base_funcs.h (working copy)
@@ -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 <bits/concept_check.h>
@@ -179,4 +179,4 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _ITERATOR_BASE_FUNCS_H */
+#endif /* _STL_ITERATOR_BASE_FUNCS_H */
Index: include/bits/stl_algo.h
===================================================================
--- include/bits/stl_algo.h (revision 125775)
+++ include/bits/stl_algo.h (working copy)
@@ -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 <bits/stl_heap.h>
#include <bits/stl_tempbuf.h> // for _Temporary_buffer
@@ -5516,4 +5516,4 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _ALGO_H */
+#endif /* _STL_ALGO_H */
Index: include/bits/stl_iterator.h
===================================================================
--- include/bits/stl_iterator.h (revision 125775)
+++ include/bits/stl_iterator.h (working copy)
@@ -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 <bits/cpp_type_traits.h>
#include <ext/type_traits.h>
Index: include/bits/stl_tempbuf.h
===================================================================
--- include/bits/stl_tempbuf.h (revision 125775)
+++ include/bits/stl_tempbuf.h (working copy)
@@ -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 <bits/stl_algobase.h>
#include <bits/stl_construct.h>
@@ -220,5 +220,5 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _TEMPBUF_H */
+#endif /* _STL_TEMPBUF_H */
Index: include/bits/stl_bvector.h
===================================================================
--- include/bits/stl_bvector.h (revision 125775)
+++ include/bits/stl_bvector.h (working copy)
@@ -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)
Index: include/bits/stl_function.h
===================================================================
--- include/bits/stl_function.h (revision 125775)
+++ include/bits/stl_function.h (working copy)
@@ -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_END_NAMESPACE
-#endif /* _FUNCTION_H */
+#endif /* _STL_FUNCTION_H */
Index: include/bits/stl_tree.h
===================================================================
--- include/bits/stl_tree.h (revision 125775)
+++ include/bits/stl_tree.h (working copy)
@@ -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 <bits/stl_algobase.h>
#include <bits/allocator.h>