summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/std/array
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2008-05-26 02:19:57 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2008-05-26 02:19:57 +0000
commit34e94b7c191fe37efd130155494b3fa494c3343d (patch)
treee5dcd8edd3cb91ff276d94dd9fa90b18fc5179ca /libstdc++-v3/include/std/array
parent286f3007d7f6f16298418190c969c8a9ecded1f6 (diff)
downloadgcc-34e94b7c191fe37efd130155494b3fa494c3343d.tar.gz
2008-05-25 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/tuple: Ifndef __GXX_EXPERIMENTAL_CXX0X__ just error out. * include/std/date_time: Likewise. * include/std/system_error: Likewise. * include/std/type_traits: Likewise; fix typo in macro name. * include/std/regex: Likewise. * include/std/random: Likewise. * include/std/unordered_map: Likewise. * include/std/condition_variable: Likewise. * include/std/unordered_set: Likewise. * include/std/mutex: Likewise. * include/std/array: Likewise. * include/c_std/cmath: Fix obsolete comment. * include/c_global/cmath: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135890 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/array')
-rw-r--r--libstdc++-v3/include/std/array6
1 files changed, 4 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array
index c84ddb6573f..fc3552aa8f9 100644
--- a/libstdc++-v3/include/std/array
+++ b/libstdc++-v3/include/std/array
@@ -1,6 +1,6 @@
// <array> -*- C++ -*-
-// Copyright (C) 2007 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008 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
@@ -38,7 +38,7 @@
#ifndef __GXX_EXPERIMENTAL_CXX0X__
# include <c++0x_warning.h>
-#endif
+#else
#if defined(_GLIBCXX_INCLUDE_AS_TR1)
# error C++0x header cannot be included from TR1 header
@@ -60,4 +60,6 @@
# undef _GLIBCXX_INCLUDE_AS_CXX0X
#endif
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
#endif // _GLIBCXX_ARRAY