cpp-reconcile-pr1

msebolt · msebolt · commit 16d9a54a384c · 2019-04-05T14:31:05.000-07:00
diff --git a/docs/cpp/bad-cast-exception.md b/docs/cpp/bad-cast-exception.md
@@ -26,6 +26,9 @@ public:
    bad_cast(const char * _Message = "bad cast");
    bad_cast(const bad_cast &);
    virtual ~bad_cast();
+
+   bad_cast& operator=(const bad_cast&) noexcept;
+   const char* what() const noexcept override;
 };
 ```
 
diff --git a/docs/cpp/bad-typeid-exception.md b/docs/cpp/bad-typeid-exception.md
@@ -24,9 +24,13 @@ The interface for **bad_typeid** is:
 class bad_typeid : public exception
 {
 public:
+   bad_typeid();
    bad_typeid(const char * _Message = "bad typeid");
    bad_typeid(const bad_typeid &);
    virtual ~bad_typeid();
+
+   bad_typeid& operator=(const bad_typeid&);
+   const char* what() const;
 };
 ```
 
diff --git a/docs/cpp/type-info-class.md b/docs/cpp/type-info-class.md
@@ -14,11 +14,14 @@ The `<typeinfo>` header file must be included in order to use the **type_info**
 ```cpp
 class type_info {
 public:
+    type_info(const type_info& rhs) = delete; // cannot be copied
     virtual ~type_info();
-    size_t hash_code() const
+    size_t hash_code() const;
     _CRTIMP_PURE bool operator==(const type_info& rhs) const;
+    type_info& operator=(const type_info& rhs) = delete; // cannot be copied
     _CRTIMP_PURE bool operator!=(const type_info& rhs) const;
     _CRTIMP_PURE int before(const type_info& rhs) const;
+    size_t hash_code() const noexcept;
     _CRTIMP_PURE const char* name() const;
     _CRTIMP_PURE const char* raw_name() const;
 };
diff --git a/docs/standard-library/bad-exception-class.md b/docs/standard-library/bad-exception-class.md
@@ -13,6 +13,11 @@ The class describes an exception that can be thrown from an unexpected handler.
 
 ```cpp
 class bad_exception    : public exception {};
+
+bad_exception();
+bad_exception(const bad_exception&);
+bad_exception& operator=(const bad_exception&);
+const char* what() const override;
 ```
 
 ## Remarks
diff --git a/docs/standard-library/exception-functions.md b/docs/standard-library/exception-functions.md
@@ -10,11 +10,11 @@ helpviewer_keywords: ["std::current_exception [C++]", "std::get_terminate [C++]"
 ||||
 |-|-|-|
 |[current_exception](#current_exception)|[get_terminate](#get_terminate)|[get_unexpected](#get_unexpected)|
-|[make_exception_ptr](#make_exception_ptr)|[rethrow_exception](#rethrow_exception)|[set_terminate](#set_terminate)|
-|[set_unexpected](#set_unexpected)|[terminate](#terminate)|[uncaught_exception](#uncaught_exception)|
-|[unexpected](#unexpected)|
+|[make_exception_ptr](#make_exception_ptr)|[rethrow_exception](#rethrow_exception)|[rethrow_if_nested](#rethrow_if_nested)|
+|[set_terminate](#set_terminate)|[set_unexpected](#set_unexpected)|][throw_if_nested](#throw_if_nested)|
+|[terminate](#terminate)|[uncaught_exception](#uncaught_exception)|[unexpected](#unexpected)|
 
-## <a name="current_exception"></a>  current_exception
+## <a name="current_exception"></a> current_exception
 
 Obtains a smart pointer to the current exception.
 
@@ -142,7 +142,14 @@ Obtains the current `unexpected_handler` function.
 unexpected_handler get_unexpected();
 ```
 
-## <a name="set_unexpected"></a>  set_unexpected
+## <a name="rethrow_if_nested"> rethrow_if_nested
+
+```cpp
+template <class E> 
+void rethrow_if_nested(const E& e);
+```
+
+## <a name="set_unexpected"></a> set_unexpected
 
 Establishes a new `unexpected_handler` to be when an unexpected exception is encountered.
 
@@ -208,6 +215,13 @@ A terminate handler may not return to its caller. At program startup, the termin
 
 See [set_unexpected](../standard-library/exception-functions.md#set_unexpected) for an example of the use of `terminate`.
 
+## <a name="throw_if_nested"> throw_if_nested
+
+```cpp
+template <class T> [[noreturn]]
+void throw_with_nested(T&& t);
+```
+
 ## <a name="uncaught_exception"></a>  uncaught_exception
 
 Returns **true** only if a thrown exception is being currently processed.
diff --git a/docs/standard-library/exception.md b/docs/standard-library/exception.md
@@ -32,9 +32,11 @@ Defines several types and functions related to the handling of exceptions. Excep
 |[get_unexpected](../standard-library/exception-functions.md#get_unexpected)|Obtains the current `unexpected_handler` function.|
 |[make_exception_ptr](../standard-library/exception-functions.md#make_exception_ptr)|Creates an `exception_ptr` object that holds a copy of an exception.|
 |[rethrow_exception](../standard-library/exception-functions.md#rethrow_exception)|Throws an exception passed as a parameter.|
+|[rethrow_if_nested](../standard-library/exception-functions.md#rethrow_if_nested)||
 |[set_terminate](../standard-library/exception-functions.md#set_terminate)|Establishes a new `terminate_handler` to be called at the termination of the program.|
 |[set_unexpected](../standard-library/exception-functions.md#set_unexpected)|Establishes a new `unexpected_handler` to be when an unexpected exception is encountered.|
 |[terminate](../standard-library/exception-functions.md#terminate)|Calls a terminate handler.|
+|[throw_with_nested](../standard-library/exception-functions.md#throw_with_nested)||
 |[uncaught_exception](../standard-library/exception-functions.md#uncaught_exception)|Returns **true** only if a thrown exception is being currently processed.|
 |[unexpected](../standard-library/exception-functions.md#unexpected)|Calls an unexpected handler.|
 
@@ -44,6 +46,7 @@ Defines several types and functions related to the handling of exceptions. Excep
 |-|-|
 |[bad_exception Class](../standard-library/bad-exception-class.md)|The class describes an exception that can be thrown from an `unexpected_handler`.|
 |[exception Class](../standard-library/exception-class.md)|The class serves as the base class for all exceptions thrown by certain expressions and by the C++ Standard Library.|
+|[nested_exception Class](../standard-library/nested-exception-class.md)||
 
 ## See also
 
diff --git a/docs/standard-library/nested-exception-class.md b/docs/standard-library/nested-exception-class.md
@@ -0,0 +1,55 @@
+---
+title: "nested_exception Class"
+ms.date: "11/04/2016"
+f1_keywords: ["exception/std::bad_exception"]
+helpviewer_keywords: ["bad_exception class"]
+ms.assetid: 5ae2c4ef-c7ad-4469-8a9e-a773e86bb000
+---
+# bad_exception Class
+
+The class describes an exception that can be thrown from an unexpected handler.
+
+## Syntax
+
+```cpp
+class nested_exception {
+    public: nested_exception();
+    nested_exception(const nested_exception&) noexcept = default;
+    nested_exception& operator=(const nested_exception&) noexcept = default;
+    virtual ~nested_exception() = default; // access functions [[noreturn]]
+    void rethrow_nested() const;
+    exception_ptr nested_ptr() const noexcept; 
+};
+
+template<class T> [[noreturn]] void throw_with_nested(T&& t); template <class E> void rethrow_if_nested(const E& e);
+
+
+template<class T> [[noreturn]] void throw_with_nested(T&& t); template <class E> void rethrow_if_nested(const E& e);
+} 
+
+    void rethrow_nested() const;
+
+```
+
+## Remarks
+
+[unexpected](../standard-library/exception-functions.md#unexpected) will throw a `bad_exception` instead of terminating or instead of calling another function specified with [set_unexpected](../standard-library/exception-functions.md#set_unexpected) if `bad_exception` is included in the throw list of a function.
+
+The value returned by `what` is an implementation-defined C string. None of the member functions throw any exceptions.
+
+For a list of members inherited by the `bad_exception` class, see [exception Class](../standard-library/exception-class.md).
+
+## Example
+
+See [set_unexpected](../standard-library/exception-functions.md#set_unexpected) for an example of the use of [unexpected](../standard-library/exception-functions.md#unexpected) throwing a `bad_exception`.
+
+## Requirements
+
+**Header:** \<exception>
+
+**Namespace:** std
+
+## See also
+
+[exception Class](../standard-library/exception-class.md)<br/>
+[Thread Safety in the C++ Standard Library](../standard-library/thread-safety-in-the-cpp-standard-library.md)<br/>
diff --git a/docs/standard-library/new-enums.md b/docs/standard-library/new-enums.md
diff --git a/docs/standard-library/new-operators.md b/docs/standard-library/new-operators.md
diff --git a/docs/standard-library/new.md b/docs/standard-library/new.md
