Module Name: src
Committed By: joerg
Date: Thu Nov 28 13:47:29 UTC 2013
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/external/bsd/libc++/include: Makefile
Log Message:
Move <dynarray> and <optional> into experimental.
To generate a diff of this commit:
cvs rdiff -u -r1.1049 -r1.1050 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1866 -r1.1867 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libc++/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1049 src/distrib/sets/lists/base/mi:1.1050
--- src/distrib/sets/lists/base/mi:1.1049 Tue Nov 12 21:58:37 2013
+++ src/distrib/sets/lists/base/mi Thu Nov 28 13:47:29 2013
@@ -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
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1866 src/distrib/sets/lists/comp/mi:1.1867
--- src/distrib/sets/lists/comp/mi:1.1866 Wed Nov 27 17:28:39 2013
+++ src/distrib/sets/lists/comp/mi Thu Nov 28 13:47:29 2013
@@ -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
Index: src/external/bsd/libc++/include/Makefile
diff -u src/external/bsd/libc++/include/Makefile:1.4 src/external/bsd/libc++/include/Makefile:1.5
--- src/external/bsd/libc++/include/Makefile:1.4 Tue Nov 12 16:39:39 2013
+++ src/external/bsd/libc++/include/Makefile Thu Nov 28 13:47:29 2013
@@ -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 .
