Imported gcc-4.4.3

[msp430-gcc.git] / libstdc++-v3 / include / bits / concept_check.h

diff --git a/libstdc++-v3/include/bits/concept_check.h b/libstdc++-v3/include/bits/concept_check.h
index 92ceefbd685e0d55bf3dab8bfea7730fed318451..6d45e268b49a99faa49f78abf71e6ffe74f0da74 100644 (file)
--- a/libstdc++-v3/include/bits/concept_check.h
+++ b/libstdc++-v3/include/bits/concept_check.h
@@ -1,11 +1,11 @@
 // Concept-checking control -*- C++ -*-
 
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2009 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
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,27 +13,22 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 /** @file concept_check.h
  *  This is an internal header file, included by other library headers.
  *  You should not attempt to use it directly.
  */
 
-#ifndef _GLIBCPP_CONCEPT_CHECK
-#define _GLIBCPP_CONCEPT_CHECK 1
+#ifndef _CONCEPT_CHECK_H
+#define _CONCEPT_CHECK_H 1
 
 #pragma GCC system_header
 
@@ -47,13 +42,13 @@
 // Concept-checking code is off by default unless users turn it on via
 // configure options or editing c++config.h.
 
-#ifndef _GLIBCPP_CONCEPT_CHECKS
+#ifndef _GLIBCXX_CONCEPT_CHECKS
 
-#define __glibcpp_function_requires(...)
-#define __glibcpp_class_requires(_a,_b)
-#define __glibcpp_class_requires2(_a,_b,_c)
-#define __glibcpp_class_requires3(_a,_b,_c,_d)
-#define __glibcpp_class_requires4(_a,_b,_c,_d,_e)
+#define __glibcxx_function_requires(...)
+#define __glibcxx_class_requires(_a,_b)
+#define __glibcxx_class_requires2(_a,_b,_c)
+#define __glibcxx_class_requires3(_a,_b,_c,_d)
+#define __glibcxx_class_requires4(_a,_b,_c,_d,_e)
 
 #else // the checks are on
 
@@ -61,8 +56,7 @@
 
 // Note that the obvious and elegant approach of
 //
-//#define glibcpp_function_requires(C)      \
-//            boost::function_requires< boost::C >()
+//#define glibcxx_function_requires(C) boost::function_requires< boost::C >()
 //
 // won't work due to concept templates with more than one parameter, e.g.,
 // BinaryPredicateConcept.  The preprocessor tries to split things up on
@@ -70,17 +64,17 @@
 // parenthesis to hide the commas, because "boost::(Temp<Foo,Bar>)" isn't
 // a valid instantiation pattern.  Thus, we steal a feature from C99.
 
-#define __glibcpp_function_requires(...)                                 \
+#define __glibcxx_function_requires(...)                                 \
             __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >();
-#define __glibcpp_class_requires(_a,_C)                                  \
-            _GLIBCPP_CLASS_REQUIRES(_a, __gnu_cxx, _C);
-#define __glibcpp_class_requires2(_a,_b,_C)                              \
-            _GLIBCPP_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
-#define __glibcpp_class_requires3(_a,_b,_c,_C)                           \
-            _GLIBCPP_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
-#define __glibcpp_class_requires4(_a,_b,_c,_d,_C)                        \
-            _GLIBCPP_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
+#define __glibcxx_class_requires(_a,_C)                                  \
+            _GLIBCXX_CLASS_REQUIRES(_a, __gnu_cxx, _C);
+#define __glibcxx_class_requires2(_a,_b,_C)                              \
+            _GLIBCXX_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
+#define __glibcxx_class_requires3(_a,_b,_c,_C)                           \
+            _GLIBCXX_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
+#define __glibcxx_class_requires4(_a,_b,_c,_d,_C)                        \
+            _GLIBCXX_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
 
 #endif // enable/disable
 
-#endif // _GLIBCPP_CONCEPT_CHECK
+#endif // _GLIBCXX_CONCEPT_CHECK