Skip to content
Snippets Groups Projects
Commit f87fbab3 authored by Greg DiCristofaro's avatar Greg DiCristofaro
Browse files

changes for building on minimal system

parent 4fec4651
No related branches found
No related tags found
No related merge requests found
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</target> </target>
<target name="compile-test" depends="compile" description="compile the tests"> <target name="compile-test" depends="compile" description="compile the tests">
<javac debug="on" srcdir="${test}" destdir="${build}" includeantruntime="false"> <javac encoding="iso-8859-1" debug="on" srcdir="${test}" destdir="${build}" includeantruntime="false">
<classpath refid="libraries"/> <classpath refid="libraries"/>
<compilerarg value="-Xlint" /> <compilerarg value="-Xlint" />
</javac> </javac>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<target name="compile" depends="init, set-library-path, retrieve-deps" description="compile the source"> <target name="compile" depends="init, set-library-path, retrieve-deps" description="compile the source">
<!-- Compile the java code from ${src} into ${build} --> <!-- Compile the java code from ${src} into ${build} -->
<javac debug="on" srcdir="${src}" destdir="${build}" classpathref="libraries" includeantruntime="false"> <javac encoding="iso-8859-1" debug="on" srcdir="${src}" destdir="${build}" classpathref="libraries" includeantruntime="false">
<compilerarg value="-Xlint"/> <compilerarg value="-Xlint"/>
</javac> </javac>
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
</copy> </copy>
<!-- Verify sample compiles --> <!-- Verify sample compiles -->
<javac debug="on" srcdir="${sample}" destdir="${build}" includeantruntime="false"> <javac encoding="iso-8859-1" debug="on" srcdir="${sample}" destdir="${build}" includeantruntime="false">
<classpath refid="libraries"/> <classpath refid="libraries"/>
</javac> </javac>
......
...@@ -343,7 +343,7 @@ is divided into following sections: ...@@ -343,7 +343,7 @@ is divided into following sections:
</path> </path>
</resourcecount> </resourcecount>
</condition> </condition>
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <javac encoding="iso-8859-1" debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
...@@ -394,7 +394,7 @@ is divided into following sections: ...@@ -394,7 +394,7 @@ is divided into following sections:
<property location="${build.dir}/empty" name="empty.dir"/> <property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/> <mkdir dir="${empty.dir}"/>
<mkdir dir="@{apgeneratedsrcdir}"/> <mkdir dir="@{apgeneratedsrcdir}"/>
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <javac encoding="iso-8859-1" debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
...@@ -436,7 +436,7 @@ is divided into following sections: ...@@ -436,7 +436,7 @@ is divided into following sections:
<sequential> <sequential>
<property location="${build.dir}/empty" name="empty.dir"/> <property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/> <mkdir dir="${empty.dir}"/>
<javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <javac encoding="iso-8859-1" debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src> <src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false"> <dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/> <include name="*"/>
......
...@@ -1194,6 +1194,7 @@ template <typename Node> ...@@ -1194,6 +1194,7 @@ template <typename Node>
APFSBtreeNodeIterator<Node>::APFSBtreeNodeIterator( APFSBtreeNodeIterator<Node>::APFSBtreeNodeIterator(
const Node *node, uint32_t index, typename Node::iterator &&child, int recursion_depth) const Node *node, uint32_t index, typename Node::iterator &&child, int recursion_depth)
: _node{own_node(node)}, _index{index} { : _node{own_node(node)}, _index{index} {
(void)recursion_depth; // so that project builds without unused parameter warning and error
_child_it = std::make_unique<typename Node::iterator>( _child_it = std::make_unique<typename Node::iterator>(
std::forward<typename Node::iterator>(child)); std::forward<typename Node::iterator>(child));
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment