diff options
| author | joerg <joerg@NetBSD.org> | 2013-11-28 13:47:29 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2013-11-28 13:47:29 +0000 |
| commit | e6417c18ba2204b4abc3c19acb8cc86af9ea8dcd (patch) | |
| tree | 5f54572e83b7ab654d318ffa646d17970c981f7d | |
| parent | ac2d417450cfa10279645dd54aa9461af6bf0152 (diff) | |
Move <dynarray> and <optional> into experimental.
| -rw-r--r-- | distrib/sets/lists/base/mi | 3 | ||||
| -rw-r--r-- | distrib/sets/lists/comp/mi | 8 | ||||
| -rw-r--r-- | external/bsd/libc++/include/Makefile | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index cdddc9fbd43..050e9bccdc7 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1049 2013/11/12 21:58:37 pettai Exp $ +# $NetBSD: mi,v 1.1050 2013/11/28 13:47:29 joerg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -812,6 +812,7 @@ ./usr/include/altq base-c-usr ./usr/include/arpa base-c-usr ./usr/include/c++ base-cxx-usr +./usr/include/c++/experimental base-cxx-usr ./usr/include/c++/ext base-cxx-usr ./usr/include/cdk base-obsolete obsolete ./usr/include/clang-3.0 base-obsolete obsolete diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 2d3b8bb379f..e7e3a31288f 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1866 2013/11/27 17:28:39 christos Exp $ +# $NetBSD: mi,v 1.1867 2013/11/28 13:47:29 joerg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -259,8 +259,10 @@ ./usr/include/c++/cwctype comp-cxx-include libcxx ./usr/include/c++/cxxabi.h comp-cxx-include libcxx ./usr/include/c++/deque comp-cxx-include libcxx -./usr/include/c++/dynarray comp-cxx-include libcxx +./usr/include/c++/dynarray comp-obsolete obsolete ./usr/include/c++/exception comp-cxx-include libcxx +./usr/include/c++/experimental/dynarray comp-cxx-include libcxx +./usr/include/c++/experimental/optional comp-cxx-include libcxx ./usr/include/c++/ext/__hash comp-cxx-include libcxx ./usr/include/c++/ext/hash_map comp-cxx-include libcxx ./usr/include/c++/ext/hash_set comp-cxx-include libcxx @@ -283,7 +285,7 @@ ./usr/include/c++/mutex comp-cxx-include libcxx ./usr/include/c++/new comp-cxx-include libcxx ./usr/include/c++/numeric comp-cxx-include libcxx -./usr/include/c++/optional comp-cxx-include libcxx +./usr/include/c++/optional comp-obsolete obsolete ./usr/include/c++/ostream comp-cxx-include libcxx ./usr/include/c++/queue comp-cxx-include libcxx ./usr/include/c++/random comp-cxx-include libcxx diff --git a/external/bsd/libc++/include/Makefile b/external/bsd/libc++/include/Makefile index b6c3a62b40c..032fef4c772 100644 --- a/external/bsd/libc++/include/Makefile +++ b/external/bsd/libc++/include/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2013/11/12 16:39:39 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2013/11/28 13:47:29 joerg Exp $ .include <bsd.init.mk> .PATH: ${LIBCXX_SRCDIR}/include +.PATH: ${LIBCXX_SRCDIR}/include/experimental .PATH: ${LIBCXX_SRCDIR}/include/ext INCS= __bit_reference \ @@ -114,6 +115,10 @@ INCSDIR= /usr/include/c++ INCSDIR_${f}= /usr/include/c++/ext .endfor +.for f in dynarray optional +INCSDIR_${f}= /usr/include/c++/experimental +.endfor + cxxabi.h: ${LIBCXXRT_SRCDIR}/src/cxxabi.h cp ${LIBCXXRT_SRCDIR}/src/cxxabi.h . |
