svn commit: r337135 - in projects/clang700-import/contrib/libc++: include include/experimental src src/experimental src/experimental/filesystem src/filesystem src/include src/support/runtime
Dimitry Andric
dim at FreeBSD.org
Thu Aug 2 17:05:38 UTC 2018
Author: dim
Date: Thu Aug 2 17:05:36 2018
New Revision: 337135
URL: https://svnweb.freebsd.org/changeset/base/337135
Log:
Merge libc++ trunk r338150, and resolve conflicts.
Added:
projects/clang700-import/contrib/libc++/include/__errc
- copied unchanged from r337131, vendor/libc++/dist/include/__errc
projects/clang700-import/contrib/libc++/include/compare
- copied unchanged from r337131, vendor/libc++/dist/include/compare
projects/clang700-import/contrib/libc++/include/experimental/simd
- copied unchanged from r337131, vendor/libc++/dist/include/experimental/simd
projects/clang700-import/contrib/libc++/include/filesystem
- copied unchanged from r337131, vendor/libc++/dist/include/filesystem
projects/clang700-import/contrib/libc++/include/span
- copied unchanged from r337131, vendor/libc++/dist/include/span
projects/clang700-import/contrib/libc++/include/version
- copied unchanged from r337131, vendor/libc++/dist/include/version
projects/clang700-import/contrib/libc++/src/filesystem/
- copied from r337131, vendor/libc++/dist/src/filesystem/
projects/clang700-import/contrib/libc++/src/include/apple_availability.h
- copied unchanged from r337131, vendor/libc++/dist/src/include/apple_availability.h
Deleted:
projects/clang700-import/contrib/libc++/src/experimental/filesystem/directory_iterator.cpp
projects/clang700-import/contrib/libc++/src/experimental/filesystem/filesystem_time_helper.h
projects/clang700-import/contrib/libc++/src/experimental/filesystem/operations.cpp
projects/clang700-import/contrib/libc++/src/experimental/filesystem/path.cpp
Modified:
projects/clang700-import/contrib/libc++/include/__bsd_locale_fallbacks.h (contents, props changed)
projects/clang700-import/contrib/libc++/include/__config
projects/clang700-import/contrib/libc++/include/__functional_03
projects/clang700-import/contrib/libc++/include/__functional_base
projects/clang700-import/contrib/libc++/include/__hash_table
projects/clang700-import/contrib/libc++/include/__libcpp_version
projects/clang700-import/contrib/libc++/include/__locale
projects/clang700-import/contrib/libc++/include/__nullptr
projects/clang700-import/contrib/libc++/include/__sso_allocator
projects/clang700-import/contrib/libc++/include/__string
projects/clang700-import/contrib/libc++/include/__threading_support
projects/clang700-import/contrib/libc++/include/__tree
projects/clang700-import/contrib/libc++/include/algorithm
projects/clang700-import/contrib/libc++/include/any
projects/clang700-import/contrib/libc++/include/array
projects/clang700-import/contrib/libc++/include/atomic
projects/clang700-import/contrib/libc++/include/chrono
projects/clang700-import/contrib/libc++/include/cmath
projects/clang700-import/contrib/libc++/include/codecvt
projects/clang700-import/contrib/libc++/include/complex
projects/clang700-import/contrib/libc++/include/deque
projects/clang700-import/contrib/libc++/include/exception
projects/clang700-import/contrib/libc++/include/experimental/__config
projects/clang700-import/contrib/libc++/include/experimental/algorithm
projects/clang700-import/contrib/libc++/include/experimental/any
projects/clang700-import/contrib/libc++/include/experimental/chrono
projects/clang700-import/contrib/libc++/include/experimental/coroutine
projects/clang700-import/contrib/libc++/include/experimental/dynarray
projects/clang700-import/contrib/libc++/include/experimental/filesystem
projects/clang700-import/contrib/libc++/include/experimental/functional
projects/clang700-import/contrib/libc++/include/experimental/memory_resource
projects/clang700-import/contrib/libc++/include/experimental/numeric
projects/clang700-import/contrib/libc++/include/experimental/optional
projects/clang700-import/contrib/libc++/include/experimental/propagate_const
projects/clang700-import/contrib/libc++/include/experimental/ratio
projects/clang700-import/contrib/libc++/include/experimental/string_view
projects/clang700-import/contrib/libc++/include/experimental/system_error
projects/clang700-import/contrib/libc++/include/experimental/tuple
projects/clang700-import/contrib/libc++/include/experimental/type_traits
projects/clang700-import/contrib/libc++/include/forward_list
projects/clang700-import/contrib/libc++/include/fstream
projects/clang700-import/contrib/libc++/include/functional
projects/clang700-import/contrib/libc++/include/future
projects/clang700-import/contrib/libc++/include/initializer_list
projects/clang700-import/contrib/libc++/include/ios
projects/clang700-import/contrib/libc++/include/istream
projects/clang700-import/contrib/libc++/include/iterator
projects/clang700-import/contrib/libc++/include/list
projects/clang700-import/contrib/libc++/include/locale
projects/clang700-import/contrib/libc++/include/map
projects/clang700-import/contrib/libc++/include/math.h (contents, props changed)
projects/clang700-import/contrib/libc++/include/memory
projects/clang700-import/contrib/libc++/include/module.modulemap
projects/clang700-import/contrib/libc++/include/new
projects/clang700-import/contrib/libc++/include/numeric
projects/clang700-import/contrib/libc++/include/optional
projects/clang700-import/contrib/libc++/include/ostream
projects/clang700-import/contrib/libc++/include/queue
projects/clang700-import/contrib/libc++/include/random
projects/clang700-import/contrib/libc++/include/regex
projects/clang700-import/contrib/libc++/include/set
projects/clang700-import/contrib/libc++/include/stack
projects/clang700-import/contrib/libc++/include/stdexcept
projects/clang700-import/contrib/libc++/include/stdio.h (contents, props changed)
projects/clang700-import/contrib/libc++/include/streambuf
projects/clang700-import/contrib/libc++/include/string
projects/clang700-import/contrib/libc++/include/string_view
projects/clang700-import/contrib/libc++/include/system_error
projects/clang700-import/contrib/libc++/include/tgmath.h (contents, props changed)
projects/clang700-import/contrib/libc++/include/thread
projects/clang700-import/contrib/libc++/include/tuple
projects/clang700-import/contrib/libc++/include/type_traits
projects/clang700-import/contrib/libc++/include/typeinfo
projects/clang700-import/contrib/libc++/include/unordered_map
projects/clang700-import/contrib/libc++/include/utility
projects/clang700-import/contrib/libc++/include/valarray
projects/clang700-import/contrib/libc++/include/variant
projects/clang700-import/contrib/libc++/include/vector
projects/clang700-import/contrib/libc++/src/any.cpp (contents, props changed)
projects/clang700-import/contrib/libc++/src/chrono.cpp (contents, props changed)
projects/clang700-import/contrib/libc++/src/experimental/memory_resource.cpp (contents, props changed)
projects/clang700-import/contrib/libc++/src/include/config_elast.h (contents, props changed)
projects/clang700-import/contrib/libc++/src/locale.cpp (contents, props changed)
projects/clang700-import/contrib/libc++/src/optional.cpp (contents, props changed)
projects/clang700-import/contrib/libc++/src/support/runtime/exception_msvc.ipp
projects/clang700-import/contrib/libc++/src/support/runtime/exception_pointer_msvc.ipp
projects/clang700-import/contrib/libc++/src/typeinfo.cpp (contents, props changed)
Directory Properties:
projects/clang700-import/contrib/libc++/ (props changed)
projects/clang700-import/contrib/libc++/include/__bsd_locale_defaults.h (props changed)
projects/clang700-import/contrib/libc++/include/complex.h (props changed)
projects/clang700-import/contrib/libc++/include/ctype.h (props changed)
projects/clang700-import/contrib/libc++/include/errno.h (props changed)
projects/clang700-import/contrib/libc++/include/float.h (props changed)
projects/clang700-import/contrib/libc++/include/inttypes.h (props changed)
projects/clang700-import/contrib/libc++/include/limits.h (props changed)
projects/clang700-import/contrib/libc++/include/locale.h (props changed)
projects/clang700-import/contrib/libc++/include/setjmp.h (props changed)
projects/clang700-import/contrib/libc++/include/stdbool.h (props changed)
projects/clang700-import/contrib/libc++/include/stddef.h (props changed)
projects/clang700-import/contrib/libc++/include/stdint.h (props changed)
projects/clang700-import/contrib/libc++/include/stdlib.h (props changed)
projects/clang700-import/contrib/libc++/include/string.h (props changed)
projects/clang700-import/contrib/libc++/include/wchar.h (props changed)
projects/clang700-import/contrib/libc++/include/wctype.h (props changed)
projects/clang700-import/contrib/libc++/src/algorithm.cpp (props changed)
projects/clang700-import/contrib/libc++/src/bind.cpp (props changed)
projects/clang700-import/contrib/libc++/src/condition_variable.cpp (props changed)
projects/clang700-import/contrib/libc++/src/debug.cpp (props changed)
projects/clang700-import/contrib/libc++/src/exception.cpp (props changed)
projects/clang700-import/contrib/libc++/src/functional.cpp (props changed)
projects/clang700-import/contrib/libc++/src/future.cpp (props changed)
projects/clang700-import/contrib/libc++/src/hash.cpp (props changed)
projects/clang700-import/contrib/libc++/src/include/atomic_support.h (props changed)
projects/clang700-import/contrib/libc++/src/include/refstring.h (props changed)
projects/clang700-import/contrib/libc++/src/ios.cpp (props changed)
projects/clang700-import/contrib/libc++/src/iostream.cpp (props changed)
projects/clang700-import/contrib/libc++/src/memory.cpp (props changed)
projects/clang700-import/contrib/libc++/src/mutex.cpp (props changed)
projects/clang700-import/contrib/libc++/src/new.cpp (props changed)
projects/clang700-import/contrib/libc++/src/random.cpp (props changed)
projects/clang700-import/contrib/libc++/src/regex.cpp (props changed)
projects/clang700-import/contrib/libc++/src/shared_mutex.cpp (props changed)
projects/clang700-import/contrib/libc++/src/stdexcept.cpp (props changed)
projects/clang700-import/contrib/libc++/src/string.cpp (props changed)
projects/clang700-import/contrib/libc++/src/strstream.cpp (props changed)
projects/clang700-import/contrib/libc++/src/system_error.cpp (props changed)
projects/clang700-import/contrib/libc++/src/thread.cpp (props changed)
projects/clang700-import/contrib/libc++/src/utility.cpp (props changed)
projects/clang700-import/contrib/libc++/src/valarray.cpp (props changed)
projects/clang700-import/contrib/libc++/src/variant.cpp (props changed)
projects/clang700-import/contrib/libc++/src/vector.cpp (props changed)
Modified: projects/clang700-import/contrib/libc++/include/__bsd_locale_fallbacks.h
==============================================================================
--- projects/clang700-import/contrib/libc++/include/__bsd_locale_fallbacks.h Thu Aug 2 16:08:16 2018 (r337134)
+++ projects/clang700-import/contrib/libc++/include/__bsd_locale_fallbacks.h Thu Aug 2 17:05:36 2018 (r337135)
@@ -24,28 +24,28 @@
_LIBCPP_BEGIN_NAMESPACE_STD
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
decltype(MB_CUR_MAX) __libcpp_mb_cur_max_l(locale_t __l)
{
__libcpp_locale_guard __current(__l);
return MB_CUR_MAX;
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
wint_t __libcpp_btowc_l(int __c, locale_t __l)
{
__libcpp_locale_guard __current(__l);
return btowc(__c);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
int __libcpp_wctob_l(wint_t __c, locale_t __l)
{
__libcpp_locale_guard __current(__l);
return wctob(__c);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_wcsnrtombs_l(char *__dest, const wchar_t **__src, size_t __nwc,
size_t __len, mbstate_t *__ps, locale_t __l)
{
@@ -53,14 +53,14 @@ size_t __libcpp_wcsnrtombs_l(char *__dest, const wchar
return wcsnrtombs(__dest, __src, __nwc, __len, __ps);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_wcrtomb_l(char *__s, wchar_t __wc, mbstate_t *__ps, locale_t __l)
{
__libcpp_locale_guard __current(__l);
return wcrtomb(__s, __wc, __ps);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_mbsnrtowcs_l(wchar_t * __dest, const char **__src, size_t __nms,
size_t __len, mbstate_t *__ps, locale_t __l)
{
@@ -68,7 +68,7 @@ size_t __libcpp_mbsnrtowcs_l(wchar_t * __dest, const c
return mbsnrtowcs(__dest, __src, __nms, __len, __ps);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_mbrtowc_l(wchar_t *__pwc, const char *__s, size_t __n,
mbstate_t *__ps, locale_t __l)
{
@@ -76,28 +76,28 @@ size_t __libcpp_mbrtowc_l(wchar_t *__pwc, const char *
return mbrtowc(__pwc, __s, __n, __ps);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
int __libcpp_mbtowc_l(wchar_t *__pwc, const char *__pmb, size_t __max, locale_t __l)
{
__libcpp_locale_guard __current(__l);
return mbtowc(__pwc, __pmb, __max);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_mbrlen_l(const char *__s, size_t __n, mbstate_t *__ps, locale_t __l)
{
__libcpp_locale_guard __current(__l);
return mbrlen(__s, __n, __ps);
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
lconv *__libcpp_localeconv_l(locale_t __l)
{
__libcpp_locale_guard __current(__l);
return localeconv();
}
-inline _LIBCPP_ALWAYS_INLINE
+inline _LIBCPP_INLINE_VISIBILITY
size_t __libcpp_mbsrtowcs_l(wchar_t *__dest, const char **__src, size_t __len,
mbstate_t *__ps, locale_t __l)
{
Modified: projects/clang700-import/contrib/libc++/include/__config
==============================================================================
--- projects/clang700-import/contrib/libc++/include/__config Thu Aug 2 16:08:16 2018 (r337134)
+++ projects/clang700-import/contrib/libc++/include/__config Thu Aug 2 17:05:36 2018 (r337135)
@@ -12,10 +12,10 @@
#define _LIBCPP_CONFIG
#if defined(_MSC_VER) && !defined(__clang__)
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
+# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+# define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
+# endif
#endif
-#endif
#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
#pragma GCC system_header
@@ -24,80 +24,96 @@
#ifdef __cplusplus
#ifdef __GNUC__
-#define _GNUC_VER (__GNUC__ * 100 + __GNUC_MINOR__)
+# define _GNUC_VER (__GNUC__ * 100 + __GNUC_MINOR__)
// The _GNUC_VER_NEW macro better represents the new GCC versioning scheme
// introduced in GCC 5.0.
-#define _GNUC_VER_NEW (_GNUC_VER * 10 + __GNUC_PATCHLEVEL__)
+# define _GNUC_VER_NEW (_GNUC_VER * 10 + __GNUC_PATCHLEVEL__)
#else
-#define _GNUC_VER 0
-#define _GNUC_VER_NEW 0
+# define _GNUC_VER 0
+# define _GNUC_VER_NEW 0
#endif
-#define _LIBCPP_VERSION 6000
+#define _LIBCPP_VERSION 7000
#ifndef _LIBCPP_ABI_VERSION
-#define _LIBCPP_ABI_VERSION 1
+# ifdef __Fuchsia__
+# define _LIBCPP_ABI_VERSION 2
+# else
+# define _LIBCPP_ABI_VERSION 1
+# endif
#endif
+#ifndef _LIBCPP_STD_VER
+# if __cplusplus <= 201103L
+# define _LIBCPP_STD_VER 11
+# elif __cplusplus <= 201402L
+# define _LIBCPP_STD_VER 14
+# elif __cplusplus <= 201703L
+# define _LIBCPP_STD_VER 17
+# else
+# define _LIBCPP_STD_VER 18 // current year, or date of c++2a ratification
+# endif
+#endif // _LIBCPP_STD_VER
+
#if defined(__ELF__)
-#define _LIBCPP_OBJECT_FORMAT_ELF 1
+# define _LIBCPP_OBJECT_FORMAT_ELF 1
#elif defined(__MACH__)
-#define _LIBCPP_OBJECT_FORMAT_MACHO 1
+# define _LIBCPP_OBJECT_FORMAT_MACHO 1
#elif defined(_WIN32)
-#define _LIBCPP_OBJECT_FORMAT_COFF 1
+# define _LIBCPP_OBJECT_FORMAT_COFF 1
#elif defined(__wasm__)
-#define _LIBCPP_OBJECT_FORMAT_WASM 1
+# define _LIBCPP_OBJECT_FORMAT_WASM 1
#else
-#error Unknown object file format
+# error Unknown object file format
#endif
#if defined(_LIBCPP_ABI_UNSTABLE) || _LIBCPP_ABI_VERSION >= 2
// Change short string representation so that string data starts at offset 0,
// improving its alignment in some cases.
-#define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
+# define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
// Fix deque iterator type in order to support incomplete types.
-#define _LIBCPP_ABI_INCOMPLETE_TYPES_IN_DEQUE
+# define _LIBCPP_ABI_INCOMPLETE_TYPES_IN_DEQUE
// Fix undefined behavior in how std::list stores its linked nodes.
-#define _LIBCPP_ABI_LIST_REMOVE_NODE_POINTER_UB
+# define _LIBCPP_ABI_LIST_REMOVE_NODE_POINTER_UB
// Fix undefined behavior in how __tree stores its end and parent nodes.
-#define _LIBCPP_ABI_TREE_REMOVE_NODE_POINTER_UB
+# define _LIBCPP_ABI_TREE_REMOVE_NODE_POINTER_UB
// Fix undefined behavior in how __hash_table stores its pointer types.
-#define _LIBCPP_ABI_FIX_UNORDERED_NODE_POINTER_UB
-#define _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB
-#define _LIBCPP_ABI_FIX_UNORDERED_CONTAINER_SIZE_TYPE
+# define _LIBCPP_ABI_FIX_UNORDERED_NODE_POINTER_UB
+# define _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB
+# define _LIBCPP_ABI_FIX_UNORDERED_CONTAINER_SIZE_TYPE
// Don't use a nullptr_t simulation type in C++03 instead using C++11 nullptr
// provided under the alternate keyword __nullptr, which changes the mangling
// of nullptr_t. This option is ABI incompatible with GCC in C++03 mode.
-#define _LIBCPP_ABI_ALWAYS_USE_CXX11_NULLPTR
+# define _LIBCPP_ABI_ALWAYS_USE_CXX11_NULLPTR
// Define the `pointer_safety` enum as a C++11 strongly typed enumeration
// instead of as a class simulating an enum. If this option is enabled
// `pointer_safety` and `get_pointer_safety()` will no longer be available
// in C++03.
-#define _LIBCPP_ABI_POINTER_SAFETY_ENUM_TYPE
+# define _LIBCPP_ABI_POINTER_SAFETY_ENUM_TYPE
// Define a key function for `bad_function_call` in the library, to centralize
// its vtable and typeinfo to libc++ rather than having all other libraries
// using that class define their own copies.
-#define _LIBCPP_ABI_BAD_FUNCTION_CALL_KEY_FUNCTION
+# define _LIBCPP_ABI_BAD_FUNCTION_CALL_KEY_FUNCTION
// Enable optimized version of __do_get_(un)signed which avoids redundant copies.
-#define _LIBCPP_ABI_OPTIMIZED_LOCALE_NUM_GET
+# define _LIBCPP_ABI_OPTIMIZED_LOCALE_NUM_GET
// Use the smallest possible integer type to represent the index of the variant.
// Previously libc++ used "unsigned int" exclusivly.
-#define _LIBCPP_ABI_VARIANT_INDEX_TYPE_OPTIMIZATION
+# define _LIBCPP_ABI_VARIANT_INDEX_TYPE_OPTIMIZATION
#elif _LIBCPP_ABI_VERSION == 1
-#if !defined(_LIBCPP_OBJECT_FORMAT_COFF)
+# if !defined(_LIBCPP_OBJECT_FORMAT_COFF)
// Enable compiling copies of now inline methods into the dylib to support
// applications compiled against older libraries. This is unnecessary with
// COFF dllexport semantics, since dllexport forces a non-inline definition
// of inline functions to be emitted anyway. Our own non-inline copy would
// conflict with the dllexport-emitted copy, so we disable it.
-#define _LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS
-#endif
+# define _LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS
+# endif
// Feature macros for disabling pre ABI v1 features. All of these options
// are deprecated.
-#if defined(__FreeBSD__)
-#define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
+# if defined(__FreeBSD__)
+# define _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR
+# endif
#endif
-#endif
#ifdef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
#error "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. \
@@ -116,46 +132,50 @@
#ifndef __has_attribute
#define __has_attribute(__x) 0
#endif
+
#ifndef __has_builtin
#define __has_builtin(__x) 0
#endif
+
#ifndef __has_extension
#define __has_extension(__x) 0
#endif
+
#ifndef __has_feature
#define __has_feature(__x) 0
#endif
+
#ifndef __has_cpp_attribute
#define __has_cpp_attribute(__x) 0
#endif
+
// '__is_identifier' returns '0' if '__x' is a reserved identifier provided by
// the compiler and '1' otherwise.
#ifndef __is_identifier
#define __is_identifier(__x) 1
#endif
+
#ifndef __has_declspec_attribute
#define __has_declspec_attribute(__x) 0
#endif
#define __has_keyword(__x) !(__is_identifier(__x))
-#ifdef __has_include
-#define __libcpp_has_include(__x) __has_include(__x)
-#else
-#define __libcpp_has_include(__x) 0
+#ifndef __has_include
+#define __has_include(...) 0
#endif
#if defined(__clang__)
-#define _LIBCPP_COMPILER_CLANG
-# ifndef __apple_build_version__
-# define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
-# endif
+# define _LIBCPP_COMPILER_CLANG
+# ifndef __apple_build_version__
+# define _LIBCPP_CLANG_VER (__clang_major__ * 100 + __clang_minor__)
+# endif
#elif defined(__GNUC__)
-#define _LIBCPP_COMPILER_GCC
+# define _LIBCPP_COMPILER_GCC
#elif defined(_MSC_VER)
-#define _LIBCPP_COMPILER_MSVC
+# define _LIBCPP_COMPILER_MSVC
#elif defined(__IBMCPP__)
-#define _LIBCPP_COMPILER_IBM
+# define _LIBCPP_COMPILER_IBM
#endif
#ifndef _LIBCPP_CLANG_VER
@@ -168,67 +188,69 @@
// and allow the user to explicitly specify the ABI to handle cases where this
// heuristic falls short.
#if defined(_LIBCPP_ABI_FORCE_ITANIUM) && defined(_LIBCPP_ABI_FORCE_MICROSOFT)
-# error "Only one of _LIBCPP_ABI_FORCE_ITANIUM and _LIBCPP_ABI_FORCE_MICROSOFT can be defined"
+# error "Only one of _LIBCPP_ABI_FORCE_ITANIUM and _LIBCPP_ABI_FORCE_MICROSOFT can be defined"
#elif defined(_LIBCPP_ABI_FORCE_ITANIUM)
-# define _LIBCPP_ABI_ITANIUM
+# define _LIBCPP_ABI_ITANIUM
#elif defined(_LIBCPP_ABI_FORCE_MICROSOFT)
-# define _LIBCPP_ABI_MICROSOFT
-#else
-# if defined(_WIN32) && defined(_MSC_VER)
# define _LIBCPP_ABI_MICROSOFT
-# else
-# define _LIBCPP_ABI_ITANIUM
-# endif
+#else
+# if defined(_WIN32) && defined(_MSC_VER)
+# define _LIBCPP_ABI_MICROSOFT
+# else
+# define _LIBCPP_ABI_ITANIUM
+# endif
#endif
// Need to detect which libc we're using if we're on Linux.
#if defined(__linux__)
-#include <features.h>
-#if !defined(__GLIBC_PREREQ)
-#define __GLIBC_PREREQ(a, b) 0
-#endif // !defined(__GLIBC_PREREQ)
+# include <features.h>
+# if defined(__GLIBC_PREREQ)
+# define _LIBCPP_GLIBC_PREREQ(a, b) __GLIBC_PREREQ(a, b)
+# else
+# define _LIBCPP_GLIBC_PREREQ(a, b) 0
+# endif // defined(__GLIBC_PREREQ)
#endif // defined(__linux__)
#ifdef __LITTLE_ENDIAN__
-#if __LITTLE_ENDIAN__
-#define _LIBCPP_LITTLE_ENDIAN
+# if __LITTLE_ENDIAN__
+# define _LIBCPP_LITTLE_ENDIAN
+# endif // __LITTLE_ENDIAN__
#endif // __LITTLE_ENDIAN__
-#endif // __LITTLE_ENDIAN__
#ifdef __BIG_ENDIAN__
-#if __BIG_ENDIAN__
-#define _LIBCPP_BIG_ENDIAN
+# if __BIG_ENDIAN__
+# define _LIBCPP_BIG_ENDIAN
+# endif // __BIG_ENDIAN__
#endif // __BIG_ENDIAN__
-#endif // __BIG_ENDIAN__
#ifdef __BYTE_ORDER__
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#define _LIBCPP_LITTLE_ENDIAN
-#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define _LIBCPP_BIG_ENDIAN
-#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+# define _LIBCPP_LITTLE_ENDIAN
+# elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+# define _LIBCPP_BIG_ENDIAN
+# endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#endif // __BYTE_ORDER__
#ifdef __FreeBSD__
-# include <sys/endian.h>
+# include <sys/endian.h>
# if _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_LITTLE_ENDIAN
-# else // _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_BIG_ENDIAN
-# endif // _BYTE_ORDER == _LITTLE_ENDIAN
-# ifndef __LONG_LONG_SUPPORTED
-# define _LIBCPP_HAS_NO_LONG_LONG
-# endif // __LONG_LONG_SUPPORTED
+# define _LIBCPP_LITTLE_ENDIAN
+# else // _BYTE_ORDER == _LITTLE_ENDIAN
+# define _LIBCPP_BIG_ENDIAN
+# endif // _BYTE_ORDER == _LITTLE_ENDIAN
+# ifndef __LONG_LONG_SUPPORTED
+# define _LIBCPP_HAS_NO_LONG_LONG
+# endif // __LONG_LONG_SUPPORTED
#endif // __FreeBSD__
#ifdef __NetBSD__
-# include <sys/endian.h>
+# include <sys/endian.h>
# if _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_LITTLE_ENDIAN
-# else // _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_BIG_ENDIAN
-# endif // _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_HAS_QUICK_EXIT
+# define _LIBCPP_LITTLE_ENDIAN
+# else // _BYTE_ORDER == _LITTLE_ENDIAN
+# define _LIBCPP_BIG_ENDIAN
+# endif // _BYTE_ORDER == _LITTLE_ENDIAN
+# define _LIBCPP_HAS_QUICK_EXIT
#endif // __NetBSD__
#if defined(_WIN32)
@@ -245,64 +267,65 @@
# if (defined(_M_AMD64) || defined(__x86_64__)) || (defined(_M_ARM) || defined(__arm__))
# define _LIBCPP_HAS_BITSCAN64
# endif
-# if defined(_LIBCPP_MSVCRT)
-# define _LIBCPP_HAS_QUICK_EXIT
-# endif
+# define _LIBCPP_HAS_OPEN_WITH_WCHAR
+# if defined(_LIBCPP_MSVCRT)
+# define _LIBCPP_HAS_QUICK_EXIT
+# endif
// Some CRT APIs are unavailable to store apps
-#if defined(WINAPI_FAMILY)
-#include <winapifamily.h>
-#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && \
- (!defined(WINAPI_PARTITION_SYSTEM) || \
- !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_SYSTEM))
-#define _LIBCPP_WINDOWS_STORE_APP
-#endif
-#endif
+# if defined(WINAPI_FAMILY)
+# include <winapifamily.h>
+# if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && \
+ (!defined(WINAPI_PARTITION_SYSTEM) || \
+ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_SYSTEM))
+# define _LIBCPP_WINDOWS_STORE_APP
+# endif
+# endif
#endif // defined(_WIN32)
#ifdef __sun__
-# include <sys/isa_defs.h>
-# ifdef _LITTLE_ENDIAN
-# define _LIBCPP_LITTLE_ENDIAN
-# else
-# define _LIBCPP_BIG_ENDIAN
-# endif
+# include <sys/isa_defs.h>
+# ifdef _LITTLE_ENDIAN
+# define _LIBCPP_LITTLE_ENDIAN
+# else
+# define _LIBCPP_BIG_ENDIAN
+# endif
#endif // __sun__
#if defined(__CloudABI__)
- // Certain architectures provide arc4random(). Prefer using
- // arc4random() over /dev/{u,}random to make it possible to obtain
- // random data even when using sandboxing mechanisms such as chroots,
- // Capsicum, etc.
-# define _LIBCPP_USING_ARC4_RANDOM
+ // Certain architectures provide arc4random(). Prefer using
+ // arc4random() over /dev/{u,}random to make it possible to obtain
+ // random data even when using sandboxing mechanisms such as chroots,
+ // Capsicum, etc.
+# define _LIBCPP_USING_ARC4_RANDOM
#elif defined(__Fuchsia__)
-# define _LIBCPP_USING_GETENTROPY
+# define _LIBCPP_USING_GETENTROPY
#elif defined(__native_client__)
- // NaCl's sandbox (which PNaCl also runs in) doesn't allow filesystem access,
- // including accesses to the special files under /dev. C++11's
- // std::random_device is instead exposed through a NaCl syscall.
-# define _LIBCPP_USING_NACL_RANDOM
+ // NaCl's sandbox (which PNaCl also runs in) doesn't allow filesystem access,
+ // including accesses to the special files under /dev. C++11's
+ // std::random_device is instead exposed through a NaCl syscall.
+# define _LIBCPP_USING_NACL_RANDOM
#elif defined(_LIBCPP_WIN32API)
-# define _LIBCPP_USING_WIN32_RANDOM
+# define _LIBCPP_USING_WIN32_RANDOM
#else
-# define _LIBCPP_USING_DEV_RANDOM
+# define _LIBCPP_USING_DEV_RANDOM
#endif
#if !defined(_LIBCPP_LITTLE_ENDIAN) && !defined(_LIBCPP_BIG_ENDIAN)
-# include <endian.h>
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-# define _LIBCPP_LITTLE_ENDIAN
-# elif __BYTE_ORDER == __BIG_ENDIAN
-# define _LIBCPP_BIG_ENDIAN
-# else // __BYTE_ORDER == __BIG_ENDIAN
-# error unable to determine endian
-# endif
+# include <endian.h>
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define _LIBCPP_LITTLE_ENDIAN
+# elif __BYTE_ORDER == __BIG_ENDIAN
+# define _LIBCPP_BIG_ENDIAN
+# else // __BYTE_ORDER == __BIG_ENDIAN
+# error unable to determine endian
+# endif
#endif // !defined(_LIBCPP_LITTLE_ENDIAN) && !defined(_LIBCPP_BIG_ENDIAN)
#if __has_attribute(__no_sanitize__) && !defined(_LIBCPP_COMPILER_GCC)
-#define _LIBCPP_NO_CFI __attribute__((__no_sanitize__("cfi")))
+# define _LIBCPP_NO_CFI __attribute__((__no_sanitize__("cfi")))
#else
-#define _LIBCPP_NO_CFI
+# define _LIBCPP_NO_CFI
#endif
#if defined(_LIBCPP_COMPILER_CLANG)
@@ -355,11 +378,11 @@ typedef __char32_t char32_t;
#endif
#if !(__has_feature(cxx_nullptr))
-# if (__has_extension(cxx_nullptr) || __has_keyword(__nullptr)) && defined(_LIBCPP_ABI_ALWAYS_USE_CXX11_NULLPTR)
-# define nullptr __nullptr
-# else
-# define _LIBCPP_HAS_NO_NULLPTR
-# endif
+# if (__has_extension(cxx_nullptr) || __has_keyword(__nullptr)) && defined(_LIBCPP_ABI_ALWAYS_USE_CXX11_NULLPTR)
+# define nullptr __nullptr
+# else
+# define _LIBCPP_HAS_NO_NULLPTR
+# endif
#endif
#if !(__has_feature(cxx_rvalue_references))
@@ -379,11 +402,11 @@ typedef __char32_t char32_t;
#endif
#if __has_feature(is_base_of)
-# define _LIBCPP_HAS_IS_BASE_OF
+#define _LIBCPP_HAS_IS_BASE_OF
#endif
#if __has_feature(is_final)
-# define _LIBCPP_HAS_IS_FINAL
+#define _LIBCPP_HAS_IS_FINAL
#endif
// Objective-C++ features (opt-in)
@@ -408,37 +431,37 @@ typedef __char32_t char32_t;
#endif
#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-#if defined(__FreeBSD__)
-#define _LIBCPP_HAS_QUICK_EXIT
-#define _LIBCPP_HAS_C11_FEATURES
-#elif defined(__Fuchsia__)
-#define _LIBCPP_HAS_QUICK_EXIT
-#define _LIBCPP_HAS_C11_FEATURES
-#elif defined(__linux__)
-#if !defined(_LIBCPP_HAS_MUSL_LIBC)
-#if __GLIBC_PREREQ(2, 15) || defined(__BIONIC__)
-#define _LIBCPP_HAS_QUICK_EXIT
+# if defined(__FreeBSD__)
+# define _LIBCPP_HAS_QUICK_EXIT
+# define _LIBCPP_HAS_C11_FEATURES
+# elif defined(__Fuchsia__)
+# define _LIBCPP_HAS_QUICK_EXIT
+# define _LIBCPP_HAS_C11_FEATURES
+# elif defined(__linux__)
+# if !defined(_LIBCPP_HAS_MUSL_LIBC)
+# if _LIBCPP_GLIBC_PREREQ(2, 15) || defined(__BIONIC__)
+# define _LIBCPP_HAS_QUICK_EXIT
+# endif
+# if _LIBCPP_GLIBC_PREREQ(2, 17)
+# define _LIBCPP_HAS_C11_FEATURES
+# endif
+# else // defined(_LIBCPP_HAS_MUSL_LIBC)
+# define _LIBCPP_HAS_QUICK_EXIT
+# define _LIBCPP_HAS_C11_FEATURES
+# endif
+# endif // __linux__
#endif
-#if __GLIBC_PREREQ(2, 17)
-#define _LIBCPP_HAS_C11_FEATURES
-#endif
-#else // defined(_LIBCPP_HAS_MUSL_LIBC)
-#define _LIBCPP_HAS_QUICK_EXIT
-#define _LIBCPP_HAS_C11_FEATURES
-#endif
-#endif // __linux__
-#endif
#if !(__has_feature(cxx_noexcept))
#define _LIBCPP_HAS_NO_NOEXCEPT
#endif
#if __has_feature(underlying_type)
-# define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
+#define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
#endif
#if __has_feature(is_literal)
-# define _LIBCPP_IS_LITERAL(T) __is_literal(T)
+#define _LIBCPP_IS_LITERAL(T) __is_literal(T)
#endif
// Inline namespaces are available in Clang regardless of C++ dialect.
@@ -458,7 +481,7 @@ namespace std {
// Allow for build-time disabling of unsigned integer sanitization
#if !defined(_LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK) && __has_attribute(no_sanitize)
#define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK __attribute__((__no_sanitize__("unsigned-integer-overflow")))
-#endif
+#endif
#if __has_builtin(__builtin_launder)
#define _LIBCPP_COMPILER_HAS_BUILTIN_LAUNDER
@@ -468,6 +491,8 @@ namespace std {
#define _LIBCPP_HAS_UNIQUE_OBJECT_REPRESENTATIONS
#endif
+#define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__))
+
#elif defined(_LIBCPP_COMPILER_GCC)
#define _ALIGNAS(x) __attribute__((__aligned__(x)))
@@ -482,7 +507,7 @@ namespace std {
#endif
#if defined(__GNUC__) && _GNUC_VER >= 403
-# define _LIBCPP_HAS_IS_BASE_OF
+#define _LIBCPP_HAS_IS_BASE_OF
#endif
#if !__EXCEPTIONS
@@ -491,10 +516,10 @@ namespace std {
// constexpr was added to GCC in 4.6.
#if _GNUC_VER < 406
-#define _LIBCPP_HAS_NO_CONSTEXPR
+# define _LIBCPP_HAS_NO_CONSTEXPR
// Can only use constexpr in c++11 mode.
#elif !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L
-#define _LIBCPP_HAS_NO_CONSTEXPR
+# define _LIBCPP_HAS_NO_CONSTEXPR
#endif
// Determine if GCC supports relaxed constexpr
@@ -508,6 +533,7 @@ namespace std {
#endif
#ifndef __GXX_EXPERIMENTAL_CXX0X__
+
#define _LIBCPP_HAS_NO_DECLTYPE
#define _LIBCPP_HAS_NO_NULLPTR
#define _LIBCPP_HAS_NO_UNICODE_CHARS
@@ -558,6 +584,8 @@ namespace std {
#define _LIBCPP_HAS_UNIQUE_OBJECT_REPRESENTATIONS
#endif
+#define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__))
+
#elif defined(_LIBCPP_COMPILER_MSVC)
#define _LIBCPP_TOSTRING2(x) #x
@@ -572,25 +600,26 @@ namespace std {
#define _LIBCPP_HAS_NO_CONSTEXPR
#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
#define _LIBCPP_HAS_NO_VARIABLE_TEMPLATES
-#if _MSC_VER <= 1800
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#endif
#define _LIBCPP_HAS_NO_NOEXCEPT
#define __alignof__ __alignof
#define _LIBCPP_NORETURN __declspec(noreturn)
#define _ALIGNAS(x) __declspec(align(x))
+#define _ALIGNAS_TYPE(x) alignas(x)
#define _LIBCPP_HAS_NO_VARIADICS
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
#define _LIBCPP_END_NAMESPACE_STD }
#define _VSTD std
-# define _LIBCPP_WEAK
namespace std {
}
+#define _LIBCPP_WEAK
+
#define _LIBCPP_HAS_NO_ASAN
+#define _LIBCPP_ALWAYS_INLINE __forceinline
+
#elif defined(_LIBCPP_COMPILER_IBM)
#define _ALIGNAS(x) __attribute__((__aligned__(x)))
@@ -621,24 +650,47 @@ namespace std {
#define _LIBCPP_HAS_NO_ASAN
+#define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__))
+
#endif // _LIBCPP_COMPILER_[CLANG|GCC|MSVC|IBM]
+#if _LIBCPP_STD_VER >= 17
+#define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \
+ _LIBCPP_BEGIN_NAMESPACE_STD inline namespace __fs { namespace filesystem {
+#else
+#define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \
+ _LIBCPP_BEGIN_NAMESPACE_STD namespace __fs { namespace filesystem {
+#endif
+
+#define _LIBCPP_END_NAMESPACE_FILESYSTEM \
+ _LIBCPP_END_NAMESPACE_STD } }
+
+#define _VSTD_FS _VSTD::__fs::filesystem
+
+
#if defined(_LIBCPP_OBJECT_FORMAT_COFF)
+
+#ifdef _DLL
+# define _LIBCPP_CRT_FUNC __declspec(dllimport)
+#else
+# define _LIBCPP_CRT_FUNC
+#endif
+
#if defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-# define _LIBCPP_DLL_VIS
-# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
-# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
-# define _LIBCPP_OVERRIDABLE_FUNC_VIS
+# define _LIBCPP_DLL_VIS
+# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
+# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
+# define _LIBCPP_OVERRIDABLE_FUNC_VIS
#elif defined(_LIBCPP_BUILDING_LIBRARY)
-# define _LIBCPP_DLL_VIS __declspec(dllexport)
-# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
-# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DLL_VIS
-# define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_DLL_VIS
+# define _LIBCPP_DLL_VIS __declspec(dllexport)
+# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
+# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS _LIBCPP_DLL_VIS
+# define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_DLL_VIS
#else
-# define _LIBCPP_DLL_VIS __declspec(dllimport)
-# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_DLL_VIS
-# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
-# define _LIBCPP_OVERRIDABLE_FUNC_VIS
+# define _LIBCPP_DLL_VIS __declspec(dllimport)
+# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_DLL_VIS
+# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
+# define _LIBCPP_OVERRIDABLE_FUNC_VIS
#endif
#define _LIBCPP_TYPE_VIS _LIBCPP_DLL_VIS
@@ -651,40 +703,37 @@ namespace std {
#define _LIBCPP_ENUM_VIS
#if defined(_LIBCPP_COMPILER_MSVC)
-# define _LIBCPP_INLINE_VISIBILITY __forceinline
-# define _LIBCPP_ALWAYS_INLINE __forceinline
-# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __forceinline
+# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __forceinline
#else
-# define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__))
-# define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__))
-# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__ ((__always_inline__))
+# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__ ((__always_inline__))
#endif
+
#endif // defined(_LIBCPP_OBJECT_FORMAT_COFF)
#ifndef _LIBCPP_HIDDEN
-#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-#define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden")))
-#else
-#define _LIBCPP_HIDDEN
+# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
+# define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden")))
+# else
+# define _LIBCPP_HIDDEN
+# endif
#endif
-#endif
#ifndef _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
-#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
+# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
// The inline should be removed once PR32114 is resolved
-#define _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS inline _LIBCPP_HIDDEN
-#else
-#define _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
+# define _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS inline _LIBCPP_HIDDEN
+# else
+# define _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS
+# endif
#endif
-#endif
#ifndef _LIBCPP_FUNC_VIS
-#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-#define _LIBCPP_FUNC_VIS __attribute__ ((__visibility__("default")))
-#else
-#define _LIBCPP_FUNC_VIS
+# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
+# define _LIBCPP_FUNC_VIS __attribute__ ((__visibility__("default")))
+# else
+# define _LIBCPP_FUNC_VIS
+# endif
#endif
-#endif
#ifndef _LIBCPP_TYPE_VIS
# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
@@ -707,20 +756,20 @@ namespace std {
#endif
#ifndef _LIBCPP_EXTERN_VIS
-# define _LIBCPP_EXTERN_VIS
+#define _LIBCPP_EXTERN_VIS
#endif
#ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS
-# define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_FUNC_VIS
+#define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_FUNC_VIS
#endif
#ifndef _LIBCPP_EXCEPTION_ABI
-#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-#define _LIBCPP_EXCEPTION_ABI __attribute__ ((__visibility__("default")))
-#else
-#define _LIBCPP_EXCEPTION_ABI
+# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
+# define _LIBCPP_EXCEPTION_ABI __attribute__ ((__visibility__("default")))
+# else
+# define _LIBCPP_EXCEPTION_ABI
+# endif
#endif
-#endif
#ifndef _LIBCPP_ENUM_VIS
# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__)
@@ -739,31 +788,28 @@ namespace std {
#endif
#ifndef _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
-# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
+#define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
#endif
-#ifndef _LIBCPP_INLINE_VISIBILITY
-#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-#define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__visibility__("hidden"), __always_inline__))
+#if __has_attribute(internal_linkage)
+# define _LIBCPP_INTERNAL_LINKAGE __attribute__ ((internal_linkage))
#else
-#define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__))
+# define _LIBCPP_INTERNAL_LINKAGE _LIBCPP_ALWAYS_INLINE
#endif
-#endif
-#ifndef _LIBCPP_ALWAYS_INLINE
-#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-#define _LIBCPP_ALWAYS_INLINE __attribute__ ((__visibility__("hidden"), __always_inline__))
-#else
-#define _LIBCPP_ALWAYS_INLINE __attribute__ ((__always_inline__))
+#ifndef _LIBCPP_HIDE_FROM_ABI
+# define _LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDDEN _LIBCPP_INTERNAL_LINKAGE
#endif
-#endif
+// Just so we can migrate to _LIBCPP_HIDE_FROM_ABI gradually.
+#define _LIBCPP_INLINE_VISIBILITY _LIBCPP_HIDE_FROM_ABI
+
#ifndef _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY
-# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
-# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__((__visibility__("default"), __always_inline__))
-# else
-# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__((__always_inline__))
-# endif
+# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
+# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__((__visibility__("default"), __always_inline__))
+# else
+# define _LIBCPP_EXTERN_TEMPLATE_INLINE_VISIBILITY __attribute__((__always_inline__))
+# endif
#endif
#ifndef _LIBCPP_PREFERRED_OVERLOAD
@@ -781,14 +827,19 @@ namespace std {
#endif
#if defined(_LIBCPP_DEBUG_USE_EXCEPTIONS)
-# if !defined(_LIBCPP_DEBUG)
-# error cannot use _LIBCPP_DEBUG_USE_EXCEPTIONS unless _LIBCPP_DEBUG is defined
-# endif
-# define _NOEXCEPT_DEBUG noexcept(false)
-# define _NOEXCEPT_DEBUG_(x) noexcept(false)
+# if !defined(_LIBCPP_DEBUG)
+# error cannot use _LIBCPP_DEBUG_USE_EXCEPTIONS unless _LIBCPP_DEBUG is defined
+# endif
+# ifdef _LIBCPP_HAS_NO_NOEXCEPT
+# define _NOEXCEPT_DEBUG
+# define _NOEXCEPT_DEBUG_(x)
+# else
+# define _NOEXCEPT_DEBUG noexcept(false)
+# define _NOEXCEPT_DEBUG_(x) noexcept(false)
+# endif
#else
-# define _NOEXCEPT_DEBUG _NOEXCEPT
-# define _NOEXCEPT_DEBUG_(x) _NOEXCEPT_(x)
+# define _NOEXCEPT_DEBUG _NOEXCEPT
+# define _NOEXCEPT_DEBUG_(x) _NOEXCEPT_(x)
#endif
#ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
@@ -801,88 +852,88 @@ typedef unsigned int char32_t;
#endif
#ifdef _LIBCPP_CXX03_LANG
-# if __has_extension(c_static_assert)
-# define static_assert(__b, __m) _Static_assert(__b, __m)
-# else
+# if __has_extension(c_static_assert)
+# define static_assert(__b, __m) _Static_assert(__b, __m)
+# else
extern "C++" {
template <bool> struct __static_assert_test;
template <> struct __static_assert_test<true> {};
template <unsigned> struct __static_assert_check {};
}
-#define static_assert(__b, __m) \
- typedef __static_assert_check<sizeof(__static_assert_test<(__b)>)> \
- _LIBCPP_CONCAT(__t, __LINE__)
-# endif // __has_extension(c_static_assert)
+# define static_assert(__b, __m) \
+ typedef __static_assert_check<sizeof(__static_assert_test<(__b)>)> \
+ _LIBCPP_CONCAT(__t, __LINE__)
+# endif // __has_extension(c_static_assert)
#endif // _LIBCPP_CXX03_LANG
#ifdef _LIBCPP_HAS_NO_DECLTYPE
// GCC 4.6 provides __decltype in all standard modes.
-#if __has_keyword(__decltype) || _LIBCPP_CLANG_VER >= 304 || _GNUC_VER >= 406
-# define decltype(__x) __decltype(__x)
-#else
-# define decltype(__x) __typeof__(__x)
+# if __has_keyword(__decltype) || _LIBCPP_CLANG_VER >= 304 || _GNUC_VER >= 406
+# define decltype(__x) __decltype(__x)
+# else
+# define decltype(__x) __typeof__(__x)
+# endif
#endif
-#endif
#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-#define _LIBCPP_CONSTEXPR
+# define _LIBCPP_CONSTEXPR
#else
-#define _LIBCPP_CONSTEXPR constexpr
+# define _LIBCPP_CONSTEXPR constexpr
#endif
#ifdef _LIBCPP_CXX03_LANG
-#define _LIBCPP_DEFAULT {}
+# define _LIBCPP_DEFAULT {}
#else
-#define _LIBCPP_DEFAULT = default;
+# define _LIBCPP_DEFAULT = default;
#endif
#ifdef _LIBCPP_CXX03_LANG
-#define _LIBCPP_EQUAL_DELETE
+# define _LIBCPP_EQUAL_DELETE
#else
-#define _LIBCPP_EQUAL_DELETE = delete
+# define _LIBCPP_EQUAL_DELETE = delete
#endif
#ifdef __GNUC__
-#define _NOALIAS __attribute__((__malloc__))
+# define _NOALIAS __attribute__((__malloc__))
#else
-#define _NOALIAS
+# define _NOALIAS
#endif
#if __has_feature(cxx_explicit_conversions) || defined(__IBMCPP__) || \
(!defined(_LIBCPP_CXX03_LANG) && defined(__GNUC__)) // All supported GCC versions
-# define _LIBCPP_EXPLICIT explicit
+# define _LIBCPP_EXPLICIT explicit
#else
-# define _LIBCPP_EXPLICIT
+# define _LIBCPP_EXPLICIT
#endif
#if !__has_builtin(__builtin_operator_new) || !__has_builtin(__builtin_operator_delete)
-# define _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
+#define _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
#endif
#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) struct _LIBCPP_TYPE_VIS x { enum __lx
-#define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x) \
- __lx __v_; \
- _LIBCPP_ALWAYS_INLINE x(__lx __v) : __v_(__v) {} \
- _LIBCPP_ALWAYS_INLINE explicit x(int __v) : __v_(static_cast<__lx>(__v)) {} \
- _LIBCPP_ALWAYS_INLINE operator int() const {return __v_;} \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list