Merge pull request libbitcoin#1362 from evoskuil/master

Fix conditional sha vectorization, consolidate simple iostream.

Makefile.am

@@ -301,10 +301,6 @@ test_libbitcoin_system_test_SOURCES = \
     test/hash/sha/sha256.cpp \
     test/hash/sha/sha512.cpp \
     test/hash/sha/vectorization.cpp \
-    test/hash/sha/clone/algorithm.hpp \
-    test/hash/sha/clone/algorithm.ipp \
-    test/hash/sha/clone/algorithm_compression.ipp \
-    test/hash/sha/clone/algorithm_vectorization.ipp \
     test/intrinsics/haves.cpp \
     test/intrinsics/intrinsics.cpp \
     test/intrinsics/xcpu/cpuid.cpp \
@@ -343,9 +339,9 @@ test_libbitcoin_system_test_SOURCES = \
     test/stream/devices/copy_source.cpp \
     test/stream/devices/flip_sink.cpp \
     test/stream/devices/push_sink.cpp \
-    test/stream/simple/iostream.cpp \
-    test/stream/simple/istream.cpp \
-    test/stream/simple/ostream.cpp \
+    test/stream/iostream/iostream.cpp \
+    test/stream/iostream/istream.cpp \
+    test/stream/iostream/ostream.cpp \
     test/stream/streamers/bit_flipper.cpp \
     test/stream/streamers/bit_reader.cpp \
     test/stream/streamers/bit_writer.cpp \
@@ -647,10 +643,11 @@ include_bitcoin_system_impl_streamdir = ${includedir}/bitcoin/system/impl/stream
 include_bitcoin_system_impl_stream_HEADERS = \
     include/bitcoin/system/impl/stream/device.ipp
 
-include_bitcoin_system_impl_stream_simpledir = ${includedir}/bitcoin/system/impl/stream/simple
-include_bitcoin_system_impl_stream_simple_HEADERS = \
-    include/bitcoin/system/impl/stream/simple/istream.ipp \
-    include/bitcoin/system/impl/stream/simple/ostream.ipp
+include_bitcoin_system_impl_stream_iostreamdir = ${includedir}/bitcoin/system/impl/stream/iostream
+include_bitcoin_system_impl_stream_iostream_HEADERS = \
+    include/bitcoin/system/impl/stream/iostream/iostream.ipp \
+    include/bitcoin/system/impl/stream/iostream/istream.ipp \
+    include/bitcoin/system/impl/stream/iostream/ostream.ipp
 
 include_bitcoin_system_impl_stream_streamersdir = ${includedir}/bitcoin/system/impl/stream/streamers
 include_bitcoin_system_impl_stream_streamers_HEADERS = \
@@ -741,6 +738,7 @@ include_bitcoin_system_streamdir = ${includedir}/bitcoin/system/stream
 include_bitcoin_system_stream_HEADERS = \
     include/bitcoin/system/stream/binary.hpp \
     include/bitcoin/system/stream/device.hpp \
+    include/bitcoin/system/stream/iostream.hpp \
     include/bitcoin/system/stream/make_stream.hpp \
     include/bitcoin/system/stream/make_streamer.hpp \
     include/bitcoin/system/stream/stream.hpp \
@@ -755,12 +753,6 @@ include_bitcoin_system_stream_devices_HEADERS = \
     include/bitcoin/system/stream/devices/flip_sink.hpp \
     include/bitcoin/system/stream/devices/push_sink.hpp
 
-include_bitcoin_system_stream_simpledir = ${includedir}/bitcoin/system/stream/simple
-include_bitcoin_system_stream_simple_HEADERS = \
-    include/bitcoin/system/stream/simple/iostream.hpp \
-    include/bitcoin/system/stream/simple/istream.hpp \
-    include/bitcoin/system/stream/simple/ostream.hpp
-
 include_bitcoin_system_stream_streamersdir = ${includedir}/bitcoin/system/stream/streamers
 include_bitcoin_system_stream_streamers_HEADERS = \
     include/bitcoin/system/stream/streamers/bit_flipper.hpp \

builds/cmake/CMakeLists.txt

@@ -775,10 +775,6 @@ if (with-tests)
         "../../test/hash/sha/sha256.cpp"
         "../../test/hash/sha/sha512.cpp"
         "../../test/hash/sha/vectorization.cpp"
-        "../../test/hash/sha/clone/algorithm.hpp"
-        "../../test/hash/sha/clone/algorithm.ipp"
-        "../../test/hash/sha/clone/algorithm_compression.ipp"
-        "../../test/hash/sha/clone/algorithm_vectorization.ipp"
         "../../test/intrinsics/haves.cpp"
         "../../test/intrinsics/intrinsics.cpp"
         "../../test/intrinsics/xcpu/cpuid.cpp"
@@ -817,9 +813,9 @@ if (with-tests)
         "../../test/stream/devices/copy_source.cpp"
         "../../test/stream/devices/flip_sink.cpp"
         "../../test/stream/devices/push_sink.cpp"
-        "../../test/stream/simple/iostream.cpp"
-        "../../test/stream/simple/istream.cpp"
-        "../../test/stream/simple/ostream.cpp"
+        "../../test/stream/iostream/iostream.cpp"
+        "../../test/stream/iostream/istream.cpp"
+        "../../test/stream/iostream/ostream.cpp"
         "../../test/stream/streamers/bit_flipper.cpp"
         "../../test/stream/streamers/bit_reader.cpp"
         "../../test/stream/streamers/bit_writer.cpp"

builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj

@@ -211,9 +211,9 @@
     <ClCompile Include="..\..\..\..\test\stream\devices\copy_source.cpp" />
     <ClCompile Include="..\..\..\..\test\stream\devices\flip_sink.cpp" />
     <ClCompile Include="..\..\..\..\test\stream\devices\push_sink.cpp" />
-    <ClCompile Include="..\..\..\..\test\stream\simple\iostream.cpp" />
-    <ClCompile Include="..\..\..\..\test\stream\simple\istream.cpp" />
-    <ClCompile Include="..\..\..\..\test\stream\simple\ostream.cpp" />
+    <ClCompile Include="..\..\..\..\test\stream\iostream\iostream.cpp" />
+    <ClCompile Include="..\..\..\..\test\stream\iostream\istream.cpp" />
+    <ClCompile Include="..\..\..\..\test\stream\iostream\ostream.cpp" />
     <ClCompile Include="..\..\..\..\test\stream\stream.cpp">
       <ObjectFileName>$(IntDir)test_stream_stream.obj</ObjectFileName>
     </ClCompile>
@@ -296,7 +296,6 @@
     <ClInclude Include="..\..\..\..\test\hash\performance\baseline\rmd160.h" />
     <ClInclude Include="..\..\..\..\test\hash\performance\baseline\sha256.h" />
     <ClInclude Include="..\..\..\..\test\hash\performance\performance.hpp" />
-    <ClInclude Include="..\..\..\..\test\hash\sha\clone\algorithm.hpp" />
     <ClInclude Include="..\..\..\..\test\hash\siphash.hpp" />
     <ClInclude Include="..\..\..\..\test\test.hpp" />
     <ClInclude Include="..\..\..\..\test\wallet\mnemonics\electrum.hpp" />
@@ -310,9 +309,6 @@
     <ClInclude Include="..\..\..\..\test\words\languages.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\test\hash\sha\clone\algorithm.ipp" />
-    <None Include="..\..\..\..\test\hash\sha\clone\algorithm_compression.ipp" />
-    <None Include="..\..\..\..\test\hash\sha\clone\algorithm_vectorization.ipp" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -346,11 +342,6 @@
     <Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.20\build\native\secp256k1_vc143.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.78.0\build\boost_unit_test_framework-vc143.targets'))" />
   </Target>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'">
-    <PostBuildEvent>
-      <Command>"$(TargetPath)" --run_test=istream_tests --show_progress=no --build_info=yes</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="..\libbitcoin-system\libbitcoin-system.vcxproj">
       <Project>{39F60708-FF48-4C22-952D-43470866F684}</Project>
@@ -359,4 +350,4 @@
   <ItemGroup>
     <Natvis Include="..\..\debug.natvis" />
   </ItemGroup>
-</Project>
+</Project>

builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj.filters

@@ -46,14 +46,11 @@
     <Filter Include="src\hash\sha">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000005}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\hash\sha\clone">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000007}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\intrinsics">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\intrinsics\xcpu">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000007}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\machine">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
@@ -71,37 +68,37 @@
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000D}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\stream\devices">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\stream\simple">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000010}</UniqueIdentifier>
+    <Filter Include="src\stream\iostream">
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\stream\streamers">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000A1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000010}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\unicode">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000E}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\unicode\utf8_everywhere">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000B1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000A1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000F}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet\addresses">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000C1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000B1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet\keys">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000D1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000C1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\wallet\mnemonics">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000E1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000D1}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\words">
       <UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000001}</UniqueIdentifier>
     </Filter>
     <Filter Include="src\words\catalogs">
-      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000F1}</UniqueIdentifier>
+      <UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000E1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -468,14 +465,14 @@
     <ClCompile Include="..\..\..\..\test\stream\devices\push_sink.cpp">
       <Filter>src\stream\devices</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\stream\simple\iostream.cpp">
-      <Filter>src\stream\simple</Filter>
+    <ClCompile Include="..\..\..\..\test\stream\iostream\iostream.cpp">
+      <Filter>src\stream\iostream</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\stream\simple\istream.cpp">
-      <Filter>src\stream\simple</Filter>
+    <ClCompile Include="..\..\..\..\test\stream\iostream\istream.cpp">
+      <Filter>src\stream\iostream</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\stream\simple\ostream.cpp">
-      <Filter>src\stream\simple</Filter>
+    <ClCompile Include="..\..\..\..\test\stream\iostream\ostream.cpp">
+      <Filter>src\stream\iostream</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\..\test\stream\stream.cpp">
       <Filter>src\stream</Filter>
@@ -671,9 +668,6 @@
     <ClInclude Include="..\..\..\..\test\hash\performance\performance.hpp">
       <Filter>src\hash\performance</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\test\hash\sha\clone\algorithm.hpp">
-      <Filter>src\hash\sha\clone</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\test\hash\siphash.hpp">
       <Filter>src\hash</Filter>
     </ClInclude>
@@ -709,15 +703,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\test\hash\sha\clone\algorithm.ipp">
-      <Filter>src\hash\sha\clone</Filter>
-    </None>
-    <None Include="..\..\..\..\test\hash\sha\clone\algorithm_compression.ipp">
-      <Filter>src\hash\sha\clone</Filter>
-    </None>
-    <None Include="..\..\..\..\test\hash\sha\clone\algorithm_vectorization.ipp">
-      <Filter>src\hash\sha\clone</Filter>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj

@@ -407,11 +407,9 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\devices\copy_source.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\devices\flip_sink.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\devices\push_sink.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\iostream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_stream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_streamer.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\iostream.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\istream.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\ostream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\stream.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\stream_result.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\streamers.hpp" />
@@ -559,8 +557,9 @@
     <None Include="..\..\..\..\include\bitcoin\system\impl\serial\deserialize.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\serial\serialize.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\device.ipp" />
-    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\istream.ipp" />
-    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\ostream.ipp" />
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\iostream\iostream.ipp" />
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\iostream\istream.ipp" />
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\iostream\ostream.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\bit_reader.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\bit_writer.ipp" />
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\byte_reader.ipp" />

builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj.filters

@@ -82,7 +82,7 @@
     <Filter Include="include\bitcoin\system\impl\stream">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\bitcoin\system\impl\stream\simple">
+    <Filter Include="include\bitcoin\system\impl\stream\iostream">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000C3}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\impl\stream\streamers">
@@ -124,41 +124,38 @@
     <Filter Include="include\bitcoin\system\stream\devices">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000005}</UniqueIdentifier>
     </Filter>
-    <Filter Include="include\bitcoin\system\stream\simple">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000006}</UniqueIdentifier>
-    </Filter>
     <Filter Include="include\bitcoin\system\stream\streamers">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000007}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000006}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\stream\streamers\interfaces">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000008}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000007}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\unicode">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\unicode\utf8_everywhere">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000009}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000008}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000A2}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet\addresses">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000009}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet\keys">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000010}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\wallet\mnemonics">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000012}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000011}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\words">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="include\bitcoin\system\words\catalogs">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000013}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000012}</UniqueIdentifier>
     </Filter>
     <Filter Include="resource">
-      <UniqueIdentifier>{39F60708-FF48-4C22-0000-0000000000A4}</UniqueIdentifier>
+      <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000013}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
       <UniqueIdentifier>{39F60708-FF48-4C22-0000-000000000000}</UniqueIdentifier>
@@ -1100,21 +1097,15 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\devices\push_sink.hpp">
       <Filter>include\bitcoin\system\stream\devices</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\iostream.hpp">
+      <Filter>include\bitcoin\system\stream</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_stream.hpp">
       <Filter>include\bitcoin\system\stream</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\make_streamer.hpp">
       <Filter>include\bitcoin\system\stream</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\iostream.hpp">
-      <Filter>include\bitcoin\system\stream\simple</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\istream.hpp">
-      <Filter>include\bitcoin\system\stream\simple</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\simple\ostream.hpp">
-      <Filter>include\bitcoin\system\stream\simple</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\system\stream\stream.hpp">
       <Filter>include\bitcoin\system\stream</Filter>
     </ClInclude>
@@ -1552,11 +1543,14 @@
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\device.ipp">
       <Filter>include\bitcoin\system\impl\stream</Filter>
     </None>
-    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\istream.ipp">
-      <Filter>include\bitcoin\system\impl\stream\simple</Filter>
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\iostream\iostream.ipp">
+      <Filter>include\bitcoin\system\impl\stream\iostream</Filter>
+    </None>
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\iostream\istream.ipp">
+      <Filter>include\bitcoin\system\impl\stream\iostream</Filter>
     </None>
-    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\simple\ostream.ipp">
-      <Filter>include\bitcoin\system\impl\stream\simple</Filter>
+    <None Include="..\..\..\..\include\bitcoin\system\impl\stream\iostream\ostream.ipp">
+      <Filter>include\bitcoin\system\impl\stream\iostream</Filter>
     </None>
     <None Include="..\..\..\..\include\bitcoin\system\impl\stream\streamers\bit_reader.ipp">
       <Filter>include\bitcoin\system\impl\stream\streamers</Filter>