re PR libstdc++/65033 (C++11 atomics: is_lock_free result does not always match the...

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

diff --git a/libstdc++-v3/include/bits/regex_error.h b/libstdc++-v3/include/bits/regex_error.h
index cfcf4798f3be94c00cee4c1fb6b7db40151a6489..778edd5a0974a368335fd4d0540ff6424dbc3a1a 100644 (file)
--- a/libstdc++-v3/include/bits/regex_error.h
+++ b/libstdc++-v3/include/bits/regex_error.h
@@ -1,6 +1,6 @@
 // class template regex -*- C++ -*-
 
-// Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2010-2015 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
@@ -32,6 +32,11 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+/**
+ * @addtogroup regex
+ * @{
+ */
+
 namespace regex_constants
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -40,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    * @name 5.3 Error Types
    */
   //@{
- 
+
   enum error_type
     {
       _S_error_collate,
@@ -56,64 +61,63 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _S_error_badrepeat,
       _S_error_complexity,
       _S_error_stack,
-      _S_error_last
     };
 
   /** The expression contained an invalid collating element name. */
-  static const error_type error_collate(_S_error_collate);
+  constexpr error_type error_collate(_S_error_collate);
 
   /** The expression contained an invalid character class name. */
-  static const error_type error_ctype(_S_error_ctype);
+  constexpr error_type error_ctype(_S_error_ctype);
 
   /**
    * The expression contained an invalid escaped character, or a trailing
    * escape.
    */
-  static const error_type error_escape(_S_error_escape);
+  constexpr error_type error_escape(_S_error_escape);
 
   /** The expression contained an invalid back reference. */
-  static const error_type error_backref(_S_error_backref);
+  constexpr error_type error_backref(_S_error_backref);
 
   /** The expression contained mismatched [ and ]. */
-  static const error_type error_brack(_S_error_brack);
+  constexpr error_type error_brack(_S_error_brack);
 
   /** The expression contained mismatched ( and ). */
-  static const error_type error_paren(_S_error_paren);
+  constexpr error_type error_paren(_S_error_paren);
 
   /** The expression contained mismatched { and } */
-  static const error_type error_brace(_S_error_brace);
+  constexpr error_type error_brace(_S_error_brace);
 
   /** The expression contained an invalid range in a {} expression. */
-  static const error_type error_badbrace(_S_error_badbrace);
+  constexpr error_type error_badbrace(_S_error_badbrace);
 
   /**
    * The expression contained an invalid character range,
    * such as [b-a] in most encodings.
    */
-  static const error_type error_range(_S_error_range);
+  constexpr error_type error_range(_S_error_range);
 
   /**
    * There was insufficient memory to convert the expression into a
    * finite state machine.
    */
-  static const error_type error_space(_S_error_space);
+  constexpr error_type error_space(_S_error_space);
 
   /**
-   * One of <em>*?+{<em> was not preceded by a valid regular expression.
+   * One of <em>*?+{</em> was not preceded by a valid regular expression.
    */
-  static const error_type error_badrepeat(_S_error_badrepeat);
+  constexpr error_type error_badrepeat(_S_error_badrepeat);
 
   /**
    * The complexity of an attempted match against a regular expression
    * exceeded a pre-set level.
    */
-  static const error_type error_complexity(_S_error_complexity);
+  constexpr error_type error_complexity(_S_error_complexity);
 
   /**
    * There was insufficient memory to determine whether the
    * regular expression could match the specified character sequence.
    */
-  static const error_type error_stack(_S_error_stack);
+  constexpr error_type error_stack(_S_error_stack);
 
   //@}
 _GLIBCXX_END_NAMESPACE_VERSION
@@ -128,19 +132,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    *
    * The regular expression library throws objects of this class on error.
    */
-  class regex_error
-  : public std::runtime_error
+  class regex_error : public std::runtime_error
   {
+    regex_constants::error_type _M_code;
+
   public:
     /**
      * @brief Constructs a regex_error object.
      *
-     * @param ecode the regex error code.
+     * @param __ecode the regex error code.
      */
     explicit
-    regex_error(regex_constants::error_type __ecode)
-    : std::runtime_error("regex_error"), _M_code(__ecode)
-    { }
+    regex_error(regex_constants::error_type __ecode);
+
+    virtual ~regex_error() throw();
 
     /**
      * @brief Gets the regex error code.
@@ -150,11 +155,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     regex_constants::error_type
     code() const
     { return _M_code; }
-
-  protected:
-    regex_constants::error_type _M_code;
   };
 
+  //@} // group regex
 
   void
   __throw_regex_error(regex_constants::error_type __ecode);