* [v3] Adjust consistently the backward/ include guards
@ 2010-03-16 23:06 Paolo Carlini
0 siblings, 0 replies; only message in thread
From: Paolo Carlini @ 2010-03-16 23:06 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++
[-- Attachment #1: Type: text/plain, Size: 78 bytes --]
Hi,
tested x86_64-linux, committed to mainline.
Paolo.
///////////////////
[-- Attachment #2: CL_backward_guards --]
[-- Type: text/plain, Size: 398 bytes --]
2010-03-16 Paolo Carlini <paolo.carlini@oracle.com>
* include/backward/hash_map: Use consistently the _BACKWARD_*
prefix for the include guard.
* include/backward/hash_fun.h: Likewise.
* include/backward/hashtable.h: Likewise.
* include/backward/auto_ptr.h: Likewise.
* include/backward/strstream: Likewise.
* include/backward/binders.h: Likewise.
* include/backward/hash_set: Likewise.
[-- Attachment #3: patch_backward_guards --]
[-- Type: text/plain, Size: 5224 bytes --]
Index: include/backward/hash_map
===================================================================
--- include/backward/hash_map (revision 157496)
+++ include/backward/hash_map (working copy)
@@ -1,6 +1,7 @@
// Hashing map implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009, 2010
+// 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
@@ -53,8 +54,8 @@
* containing extensions from the HP/SGI STL subset).
*/
-#ifndef _HASH_MAP
-#define _HASH_MAP 1
+#ifndef _BACKWARD_HASH_MAP
+#define _BACKWARD_HASH_MAP 1
#include "backward_warning.h"
#include <bits/c++config.h>
Index: include/backward/hash_fun.h
===================================================================
--- include/backward/hash_fun.h (revision 157496)
+++ include/backward/hash_fun.h (working copy)
@@ -1,6 +1,7 @@
// 'struct hash' from SGI -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010
+// 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
@@ -53,8 +54,8 @@
* containing extensions from the HP/SGI STL subset).
*/
-#ifndef _HASH_FUN_H
-#define _HASH_FUN_H 1
+#ifndef _BACKWARD_HASH_FUN_H
+#define _BACKWARD_HASH_FUN_H 1
#include <cstddef>
Index: include/backward/hashtable.h
===================================================================
--- include/backward/hashtable.h (revision 157496)
+++ include/backward/hashtable.h (working copy)
@@ -1,6 +1,6 @@
// Hashtable implementation used by containers -*- C++ -*-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -54,8 +54,8 @@
* containing extensions from the HP/SGI STL subset).
*/
-#ifndef _HASHTABLE_H
-#define _HASHTABLE_H 1
+#ifndef _BACKWARD_HASHTABLE_H
+#define _BACKWARD_HASHTABLE_H 1
// Hashtable class, used to implement the hashed associative containers
// hash_set, hash_map, hash_multiset, and hash_multimap.
Index: include/backward/auto_ptr.h
===================================================================
--- include/backward/auto_ptr.h (revision 157496)
+++ include/backward/auto_ptr.h (working copy)
@@ -27,8 +27,8 @@
* You should not attempt to use it directly.
*/
-#ifndef _STL_AUTO_PTR_H
-#define _STL_AUTO_PTR_H 1
+#ifndef _BACKWARD_AUTO_PTR_H
+#define _BACKWARD_AUTO_PTR_H 1
#include <bits/c++config.h>
#include <debug/debug.h>
@@ -289,4 +289,4 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _STL_AUTO_PTR_H */
+#endif /* _BACKWARD_AUTO_PTR_H */
Index: include/backward/strstream
===================================================================
--- include/backward/strstream (revision 157496)
+++ include/backward/strstream (working copy)
@@ -1,6 +1,7 @@
// Backward-compat support -*- C++ -*-
-// Copyright (C) 2001, 2002, 2004, 2005, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005, 2009, 2010
+// 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
@@ -40,8 +41,8 @@
// MAY BE REMOVED in a future standard revision. One should use the
// header <sstream> instead.
-#ifndef _GLIBCXX_STRSTREAM
-#define _GLIBCXX_STRSTREAM
+#ifndef _BACKWARD_STRSTREAM
+#define _BACKWARD_STRSTREAM
#include "backward_warning.h"
#include <iosfwd>
Index: include/backward/binders.h
===================================================================
--- include/backward/binders.h (revision 157496)
+++ include/backward/binders.h (working copy)
@@ -54,8 +54,8 @@
* You should not attempt to use it directly.
*/
-#ifndef _GLIBCXX_BINDERS_H
-#define _GLIBCXX_BINDERS_H 1
+#ifndef _BACKWARD_BINDERS_H
+#define _BACKWARD_BINDERS_H 1
_GLIBCXX_BEGIN_NAMESPACE(std)
@@ -166,4 +166,4 @@
_GLIBCXX_END_NAMESPACE
-#endif /* _GLIBCXX_BINDERS_H */
+#endif /* _BACKWARD_BINDERS_H */
Index: include/backward/hash_set
===================================================================
--- include/backward/hash_set (revision 157496)
+++ include/backward/hash_set (working copy)
@@ -1,6 +1,7 @@
// Hashing set implementation -*- C++ -*-
-// Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005, 2006, 2009, 2010
+// 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
@@ -53,8 +54,8 @@
* containing extensions from the HP/SGI STL subset).
*/
-#ifndef _HASH_SET
-#define _HASH_SET 1
+#ifndef _BACKWARD_HASH_SET
+#define _BACKWARD_HASH_SET 1
#include "backward_warning.h"
#include <bits/c++config.h>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-16 22:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-16 23:06 [v3] Adjust consistently the backward/ include guards Paolo Carlini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).