diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/lib/libcxx/optional.cpp | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/lib/libcxx/optional.cpp')
| -rw-r--r-- | system/lib/libcxx/optional.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/lib/libcxx/optional.cpp b/system/lib/libcxx/optional.cpp index fde071c9..b614d811 100644 --- a/system/lib/libcxx/optional.cpp +++ b/system/lib/libcxx/optional.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "optional" +#include "experimental/optional" namespace std // purposefully not using versioning namespace -{ +{ namespace experimental { #ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS @@ -22,4 +22,4 @@ bad_optional_access::~bad_optional_access() _NOEXCEPT = default; #endif -} // std +}} // std::experimental |