diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2006-07-21 23:54:41 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2006-07-21 23:54:41 +0000 |
| commit | 76b4581d0955756f2943d58e2e260b1e1a8059d0 (patch) | |
| tree | 95f91bbfb887884af00a1364f3f73d051fd21fc0 | |
| parent | 303f32ccd7cdf2e5cf1035a56599905ace682dbc (diff) | |
| download | gcc-76b4581d0955756f2943d58e2e260b1e1a8059d0.zip gcc-76b4581d0955756f2943d58e2e260b1e1a8059d0.tar.gz gcc-76b4581d0955756f2943d58e2e260b1e1a8059d0.tar.bz2 | |
random: Make include guards consistent.
2006-07-21 Benjamin Kosnik <bkoz@redhat.com>
* include/tr1/random: Make include guards consistent.
* include/tr1/unordered_map: Same.
* include/tr1/hashtable: Same.
* include/tr1/unordered_set: Same.
From-SVN: r115656
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/hashtable | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/random | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/unordered_map | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/unordered_set | 6 |
5 files changed, 20 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c0092fd..155bb86 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2006-07-21 Benjamin Kosnik <bkoz@redhat.com> + + * include/tr1/random: Make include guards consistent. + * include/tr1/unordered_map: Same. + * include/tr1/hashtable: Same. + * include/tr1/unordered_set: Same. + 2006-07-21 Steve Ellcey <sje@cup.hp.com> PR target/26792 diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable index 7c7c144..d5041f7 100644 --- a/libstdc++-v3/include/tr1/hashtable +++ b/libstdc++-v3/include/tr1/hashtable @@ -51,8 +51,8 @@ // A. Tavori and V. Dreizin, "Generic Associative Containers", 2004. // ??? Full citation? -#ifndef GNU_LIBSTDCXX_TR1_HASHTABLE_ -#define GNU_LIBSTDCXX_TR1_HASHTABLE_ +#ifndef _TR1_HASHTABLE +#define _TR1_HASHTABLE 1 #include <utility> // For std::pair #include <memory> @@ -1957,7 +1957,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) } _GLIBCXX_END_NAMESPACE -} // Namespace std::tr1 +} // namespace std::tr1 -#endif /* GNU_LIBSTDCXX_TR1_HASHTABLE_ */ +#endif // _TR1_HASHTABLE diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index 59e326d..01ada8b 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -27,8 +27,8 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#ifndef _STD_TR1_RANDOM -#define _STD_TR1_RANDOM 1 +#ifndef _TR1_RANDOM +#define _TR1_RANDOM 1 /** * @file @@ -2046,4 +2046,4 @@ _GLIBCXX_END_NAMESPACE #include <tr1/random.tcc> -#endif // _STD_TR1_RANDOM +#endif // _TR1_RANDOM diff --git a/libstdc++-v3/include/tr1/unordered_map b/libstdc++-v3/include/tr1/unordered_map index da0d86b..207ddbf 100644 --- a/libstdc++-v3/include/tr1/unordered_map +++ b/libstdc++-v3/include/tr1/unordered_map @@ -31,8 +31,8 @@ * This is a TR1 C++ Library header. */ -#ifndef GNU_LIBSTDCXX_TR1_UNORDERED_MAP_ -#define GNU_LIBSTDCXX_TR1_UNORDERED_MAP_ +#ifndef _TR1_UNORDERED_MAP +#define _TR1_UNORDERED_MAP 1 #include <tr1/hashtable> #include <tr1/functional> @@ -164,4 +164,4 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) _GLIBCXX_END_NAMESPACE } -#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_MAP_ */ +#endif // _TR1_UNORDERED_MAP diff --git a/libstdc++-v3/include/tr1/unordered_set b/libstdc++-v3/include/tr1/unordered_set index 02c5184..1e35c79 100644 --- a/libstdc++-v3/include/tr1/unordered_set +++ b/libstdc++-v3/include/tr1/unordered_set @@ -31,8 +31,8 @@ * This is a TR1 C++ Library header. */ -#ifndef GNU_LIBSTDCXX_TR1_UNORDERED_SET_ -#define GNU_LIBSTDCXX_TR1_UNORDERED_SET_ +#ifndef _TR1_UNORDERED_SET +#define _TR1_UNORDERED_SET 1 #include <tr1/hashtable> #include <tr1/functional> @@ -160,4 +160,4 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) _GLIBCXX_END_NAMESPACE } -#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_SET_ */ +#endif // _TR1_UNORDERED_SET |