2009-03-11 Jonathan Wakely <jwakely.gcc@gmail.com>

	* include/bits/shared_ptr.h: Add include guards.
	* include/tr1/shared_ptr.h: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144778 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b7e68d8..c1387ac 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2009-03-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
+       * include/bits/shared_ptr.h: Add include guards.
+       * include/tr1/shared_ptr.h: Likewise.
+
+2009-03-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
        * include/std/iostream: Fix doxygen link.
        * include/bits/forward_list.h: Fix doxygen markup.
        * include/ext/vstring.h: Escape backslash in doxygen comment.

diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h
index 8e70984..5ede8ad 100644 (file)
--- a/libstdc++-v3/include/bits/shared_ptr.h
+++ b/libstdc++-v3/include/bits/shared_ptr.h
@@ -51,6 +51,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _SHARED_PTR_H
+#define _SHARED_PTR_H 1
+
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 # include <c++0x_warning.h>
 #endif
@@ -1589,3 +1592,5 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   // @} group pointer_abstractions
 
 _GLIBCXX_END_NAMESPACE
+
+#endif // _SHARED_PTR_H

diff --git a/libstdc++-v3/include/tr1/shared_ptr.h b/libstdc++-v3/include/tr1/shared_ptr.h
index a215614..7725145 100644 (file)
--- a/libstdc++-v3/include/tr1/shared_ptr.h
+++ b/libstdc++-v3/include/tr1/shared_ptr.h
@@ -51,6 +51,9 @@
  *  You should not attempt to use it directly.
  */
 
+#ifndef _TR1_SHARED_PTR_H
+#define _TR1_SHARED_PTR_H 1
+
 #if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #  error TR1 header cannot be included from C++0x header
 #endif
@@ -1018,3 +1021,5 @@ namespace tr1
 
 }
 }
+
+#endif // _TR1_SHARED_PTR_H