Skip to content

Commit a8c2121

Browse files
eseilereseiler
committed
work without zlib/bzip2
it was ifdef before, which was always true anyway
1 parent 8b5d7fd commit a8c2121

29 files changed

+88
-90
lines changed

‎doc/cookbook/compression_threads.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: 2016-2025 Knut Reinert & MPI für molekulare Genetik
33
// SPDX-License-Identifier: CC0-1.0
44

5-
#if defined(SEQAN3_HAS_ZLIB)
5+
#if SEQAN3_HAS_ZLIB
66
//![example]
77
# include <seqan3/io/all.hpp>
88

@@ -24,4 +24,4 @@ int main()
2424
return 0;
2525
}
2626
//![example]
27-
#endif // defined(SEQAN3_HAS_ZLIB)
27+
#endif

‎include/seqan3/contrib/stream/bgzf_istream.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030
#include <seqan3/contrib/stream/bgzf_stream_util.hpp>
3131
#include <seqan3/utility/parallel/detail/reader_writer_manager.hpp>
3232

33-
#if !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
34-
# error "This file cannot be used when building without GZip-support."
35-
#endif // !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
36-
37-
#if defined(SEQAN3_HAS_ZLIB)
33+
#if SEQAN3_HAS_ZLIB
3834
namespace seqan3::contrib
3935
{
4036

‎include/seqan3/contrib/stream/bgzf_ostream.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
#include <seqan3/contrib/parallel/suspendable_queue.hpp>
3030
#include <seqan3/contrib/stream/bgzf_stream_util.hpp>
3131

32-
#if !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
33-
# error "This file cannot be used when building without GZip-support."
34-
#endif // !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
35-
36-
#if defined(SEQAN3_HAS_ZLIB)
32+
#if SEQAN3_HAS_ZLIB
3733

3834
namespace seqan3::contrib
3935
{

‎include/seqan3/contrib/stream/bgzf_stream_util.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
#include <seqan3/io/exception.hpp>
2424
#include <seqan3/utility/detail/to_little_endian.hpp>
2525

26-
#if !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
27-
# error "This file cannot be used when building without GZip-support."
28-
#endif // !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
29-
30-
#if defined(SEQAN3_HAS_ZLIB)
26+
#if SEQAN3_HAS_ZLIB
3127
// Zlib headers
3228
# include <zlib.h>
3329

‎include/seqan3/contrib/stream/bz2_istream.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@
2828

2929
#include <seqan3/core/platform.hpp>
3030

31-
#if !defined(SEQAN3_HAS_BZIP2) && !defined(SEQAN3_HEADER_TEST)
32-
#error "This file cannot be used when building without BZIP2-support."
33-
#endif // !defined(SEQAN3_HAS_BZIP2) && !defined(SEQAN3_HEADER_TEST)
34-
35-
#if defined(SEQAN3_HAS_BZIP2)
31+
#if SEQAN3_HAS_BZIP2
3632

3733
#define BZ_NO_STDIO
3834
#include <bzlib.h>

‎include/seqan3/contrib/stream/bz2_ostream.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929

3030
#include <seqan3/core/platform.hpp>
3131

32-
#if !defined(SEQAN3_HAS_BZIP2) && !defined(SEQAN3_HEADER_TEST)
33-
#error "This file cannot be used when building without BZIP2-support."
34-
#endif // !defined(SEQAN3_HAS_BZIP2) && !defined(SEQAN3_HEADER_TEST)
35-
36-
#if defined(SEQAN3_HAS_BZIP2)
32+
#if SEQAN3_HAS_BZIP2
3733

3834
#define BZ_NO_STDIO
3935
#include <bzlib.h>

‎include/seqan3/contrib/stream/gz_istream.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030

3131
#include <seqan3/core/platform.hpp>
3232

33-
#if !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
34-
#error "This file cannot be used when building without ZLIB-support."
35-
#endif // !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
36-
37-
#if defined(SEQAN3_HAS_ZLIB)
33+
#if SEQAN3_HAS_ZLIB
3834

3935
#include <zlib.h>
4036

‎include/seqan3/contrib/stream/gz_ostream.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929

3030
#include <seqan3/core/platform.hpp>
3131

32-
#if !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
33-
#error "This file cannot be used when building without ZLIB-support."
34-
#endif // !defined(SEQAN3_HAS_ZLIB) && !defined(SEQAN3_HEADER_TEST)
35-
36-
#if defined(SEQAN3_HAS_ZLIB)
32+
#if SEQAN3_HAS_ZLIB
3733

3834
#include <zlib.h>
3935

‎include/seqan3/io/detail/magic_header.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ struct bgzf_compression
114114
* \ingroup io
115115
*/
116116
using compression_formats = pack_traits::drop_front<void
117-
#if defined(SEQAN3_HAS_ZLIB)
117+
#if SEQAN3_HAS_ZLIB
118118
,
119119
gz_compression,
120120
bgzf_compression
121121
#endif // defined(SEQAN3_HAS_ZLIB)
122-
#if defined(SEQAN3_HAS_BZIP2)
122+
#if SEQAN3_HAS_BZIP2
123123
,
124124
bz2_compression
125125
#endif // defined(SEQAN3_HAS_BZIP2)

‎include/seqan3/io/detail/misc_input.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ inline auto make_secondary_istream(std::basic_istream<char_t> & primary_stream,
116116
// set return value appropriately
117117
if (read_chars == magic_number.size() && bgzf_compression::validate_header(std::span{magic_number})) // BGZF
118118
{
119-
#if defined(SEQAN3_HAS_ZLIB)
119+
#if SEQAN3_HAS_ZLIB
120120
if (contains_extension(gz_compression{}, extension) || contains_extension(bgzf_compression{}, extension))
121121
filename.replace_extension();
122122

@@ -127,7 +127,7 @@ inline auto make_secondary_istream(std::basic_istream<char_t> & primary_stream,
127127
}
128128
else if (starts_with(magic_number, gz_compression::magic_header)) // GZIP
129129
{
130-
#if defined(SEQAN3_HAS_ZLIB)
130+
#if SEQAN3_HAS_ZLIB
131131
if (contains_extension(gz_compression{}, extension) || contains_extension(bgzf_compression{}, extension))
132132
filename.replace_extension();
133133

@@ -138,7 +138,7 @@ inline auto make_secondary_istream(std::basic_istream<char_t> & primary_stream,
138138
}
139139
else if (starts_with(magic_number, bz2_compression::magic_header)) // BZip2
140140
{
141-
#if defined(SEQAN3_HAS_BZIP2)
141+
#if SEQAN3_HAS_BZIP2
142142
if (contains_extension(bz2_compression{}, extension))
143143
filename.replace_extension();
144144

0 commit comments

Comments
 (0)