Skip to content

Commit 28a4de1

Browse files
committed
[FIX] Update some parts after rebase
1 parent b4ed32e commit 28a4de1

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

include/seqan3/io/detail/magic_header.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <array>
1616
#include <tuple>
1717

18-
#include <seqan3/core/metafunction/template_inspection.hpp>
18+
#include <seqan3/core/type_traits/template_inspection.hpp>
1919
#include <seqan3/core/platform.hpp>
2020
#include <seqan3/core/type_list.hpp>
2121

include/seqan3/io/detail/misc_input.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ inline auto make_secondary_istream(std::basic_istream<char_t> & primary_stream,
107107
if (read_chars == magic_number.size() && contrib::_bgzfCheckHeader(magic_number.data())) // BGZF
108108
{
109109
#ifdef SEQAN3_HAS_ZLIB
110-
if ((extension == ".gz") || (extension == ".bgzf"))
110+
if ((std::ranges::find(gz_compression::file_extensions, extension) !=
111+
std::ranges::end(gz_compression::file_extensions)) ||
112+
(std::ranges::find(bgzf_compression::file_extensions, extension) !=
113+
std::ranges::end(bgzf_compression::file_extensions)))
114+
{
111115
filename.replace_extension();
116+
}
112117

113118
return {new contrib::basic_bgzf_istream<char_t>{primary_stream},
114119
stream_deleter_default};

test/unit/io/detail/misc_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <string>
1111
#include <vector>
1212

13+
#include <seqan3/io/detail/magic_header.hpp>
1314
#include <seqan3/io/detail/misc.hpp>
1415
#include <seqan3/std/ranges>
1516
#include <seqan3/test/tmp_filename.hpp>
@@ -54,7 +55,6 @@ TEST(misc, valid_file_extensions)
5455

5556
TEST(misc, valid_compression_extensions)
5657
{
57-
5858
std::vector<std::string> valid_compression = detail::valid_file_extensions<detail::compression_formats>();
5959

6060
#if defined(SEQAN3_HAS_ZLIB)

0 commit comments

Comments
 (0)