Fix/macos boost cmake for osx

.github/workflows/ccpp.yml

@@ -29,7 +29,7 @@ jobs:
     - name: regression
       working-directory: ./regression
       run: ./regression.sh ../build test
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: regression_data
@@ -56,7 +56,7 @@ jobs:
     - name: regression
       working-directory: ./regression
       run: ./regression.sh ../build test
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: regression_data_clang

AGENTS.md

@@ -0,0 +1,28 @@
+# Repository Guidelines
+
+## Project Structure & Module Organization
+- Core shared code in `common/src` with unit tests in `common/test`; executables live in tool-specific folders (`hts_AdapterTrimmer`, `hts_SuperDeduper`, etc.), each with `src/`, `test/`, and a local `README` describing options.
+- CMake configuration lives in the repo root and `cmake/`; third-party archives (googletest) are in `ext/`.
+- `regression/` holds small FASTQ fixtures and expected outputs for end-to-end checks. Build artifacts should stay outside the repo (e.g., `build/`).
+
+## Build, Test, and Development Commands
+- Configure an out-of-source build: `cmake -S . -B build -DCMAKE_BUILD_TYPE=Release` (add `-DBUILD_STATIC_BIN=ON` for static Linux binaries or `-DBUILD_GPERFTOOLS=ON` when profiling).
+- Compile: `cmake --build build -j$(nproc)`; copy of `compile_commands.json` is generated for tooling.
+- Unit tests: `ctest --test-dir build` (or `cmake --build build --target test` / `make test` inside `build`).
+- Regression check after building: `cd regression && ./regression.sh ../build test` to compare outputs against fixtures.
+
+## Coding Style & Naming Conventions
+- C++11 codebase compiled with `-Wall -Werror` (and `-Wextra` on Clang); keep code warning-clean.
+- Prefer 4-space indentation, Allman-style braces, and explicit `std::`/`boost::` qualifiers; headers guard with `#ifndef/#define`.
+- Executable targets follow `hts_*` naming; tests mirror module names (e.g., `hts_TestQWindowTrim.cpp`).
+- Use existing option-parsing helpers in `common/src/utils.h` and keep new flags documented in the module `README`.
+
+## Testing Guidelines
+- Unit tests use GoogleTest (vendored under `ext/googletest`); place new cases in the module’s `test/` folder and keep filenames consistent with the tool under test.
+- When behavior depends on streaming order, add deterministic sorting (see `regression/regression.sh` handling for `hts_SuperDeduper`).
+- For new CLI flags, include tests covering default behavior, error handling (invalid parameters), and representative FASTQ inputs.
+
+## Commit & Pull Request Guidelines
+- Commit messages are short and imperative (e.g., “Fix clang warnings”, “Update release doc”); reference issues with `#123` when relevant.
+- Before opening a PR, run unit tests and regression checks, and update version info (`common/src/version.h.release`) only when preparing a release branch.
+- PRs should summarize the change, outline user-visible flags or defaults that shifted, note test coverage, and link any tracking issue. Include sample commands if the workflow changes.

CMakeLists.txt

@@ -4,15 +4,23 @@ project (HTStream)
 option(BUILD_STATIC_BIN "builds static binary (linux only)" OFF)
 option(BUILD_GPERFTOOLS "links to google perftools" OFF)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+# Ensure built-in find modules are always searched alongside project modules.
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_ROOT}/Modules" "${CMAKE_SOURCE_DIR}/cmake")
 message( status "cmake module path: " ${CMAKE_MODULE_PATH})
 
 set(CMAKE_CXX_STANDARD 11)
 
-## suppress findboost warnings
+## keep FindBoost available on newer CMake
 if(POLICY CMP0167)
-  cmake_policy(SET CMP0167 NEW)
+  cmake_policy(SET CMP0167 OLD)
 endif()
+if(POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif()
+
+# Prefer Find modules over config packages when both are present.
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
+set(Boost_NO_BOOST_CMAKE ON CACHE BOOL "Use legacy FindBoost module instead of BoostConfig")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(Boost_USE_STATIC_LIBS OFF)

cmake/version.cmake

@@ -5,6 +5,8 @@ execute_process(
   RESULT_VARIABLE result
 )
 
+file(MAKE_DIRECTORY "${BIN_DIR}/common")
+
 if(result EQUAL "0")
   message("execute git version " ${HTSTREAM_VERSION})
   configure_file(${SRC_DIR}/common/src/version.h.in

common/CMakeLists.txt

@@ -19,14 +19,14 @@ add_custom_command(
     )  
 
 file(GLOB sources "src/*.cpp")
-list(APPEND sources  ${CMAKE_BINARY_DIR}/common/version.h)
 message( "common sources: " ${sources})
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options filesystem iostreams REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options filesystem iostreams)
 
 include_directories(${GTEST_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} ${COMMON_INCLUDES} )
 
 add_library(${PROJECT_NAME} STATIC ${sources})
+add_dependencies(${PROJECT_NAME} generateVersion)
 target_link_libraries(${PROJECT_NAME}  ${Boost_LIBRARIES})
 
 ## test
@@ -38,7 +38,8 @@ file(GLOB TEST_SRC_FILES ${PROJECT_SOURCE_DIR}/test/*.cpp)
 link_directories(${GTEST_LIBS_DIR})
 
 add_executable(${PROJECT_TEST_NAME} ${TEST_SRC_FILES} ${sources})
+add_dependencies(${PROJECT_TEST_NAME} generateVersion)
 
 #add_dependencies(${PROJECT_TEST_NAME} googletest)
 target_link_libraries(${PROJECT_TEST_NAME} gtest gtest_main ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} ${PROJECT_LINK_LIBS})
-add_test(test_common ${PROJECT_TEST_NAME})
+add_test(NAME test_common COMMAND ${PROJECT_TEST_NAME})

common/src/ioHandler.cpp

@@ -92,9 +92,6 @@ ReadPtr InputFastq::load_read(std::istream *input) {
         throw HtsIOException("id line did not begin with @");
     }
     std::getline(*input, seq);
-    if (seq.size() < 1) {
-        throw HtsIOException("invalid seq line empty");
-    }
     std::getline(*input, id2);
     if (id2.size() < 1) {
         throw HtsIOException("invalid id2 line empty");

common/test/testIO.cpp

@@ -12,6 +12,7 @@ extern template class InputReader<ReadBase, TabReadImpl>;
 class ReadsTest : public ::testing::Test {
 public:
     const std::string readData = "@M03610:15:000000000-ALE1U:1:1101:17702:1965 1:N:0:1\nCCTTTTGTTTGTATTGTTTCTCTTAAGCATATTTCTTAATTACTTAACTAACTACCTCAAATGAAATTTGTAAAAAATCCATCAATTTTAACCGCTTGTTTGCTTGCCAGTGTCCTCGGAGGCATTGGGACACTCGCCTACTCCCCTTTTG\n+\nAAAAAF5CFFFF6FGFGGGGGGHHGHHFBHFFHHHHHBEGHHHHHEGGHHHHHFGFGGFEFGHBFBHHHHHEEGFFEGHHFHHEBGHHHEGHHGEGGEHHHGHHHEHHFFG3GHHHHGCDEGGGHHDGEHHGHHHFEEGGFHHHHGHHHH1\n@M03610:15:000000000-ALE1U:1:1101:13392:1966 1:N:0:1\nGTCGCCGGATCTAATGCACTTGTCGCTTCATCGCATAATAAAACGTGCGGATCACTTGCCAACGCACGGGCAATCGCTACACGTTGTTTCTGACCACCGGATAAATTGCTCGGATAAACGTCTTTACGTTCAGTTAAGCCGACCAATTCAA\n+\n>AA3>A>22ADFC5FBGGGGGCGHGHGHGGHHHGGGGFHFFHFGGHHHGGGGEHHHHFHHGHGGGGGGGCGGFHHGGHGGHHGHHHGHHHHHHHHGHGGGGGGFHHHHHHHGGGGGHHHGHHHGHHHGHHHHHHHGGEGFC?DGGHHHHG0\n@M03610:15:000000000-ALE1U:1:1101:19181:1996 1:N:0:1\nATTTGTGGCAATGGCGAGTTTGGGGCGATACCAATATCCACACAATAGCCAGTAAACTTAACGTTAGCGGGCAAGGAAATTGGCACCAAAATTTGGTACAACTCAACAAATTAAGTGGTGAATTAGGCAAAATTCACCAGAAAGGCGTGTA\n+\n>AAA3DCAAFFFB4EAEFGGGE2AFGGGGFGHBGHFHHHFHHGGGHHHHHHHHHHHHHHHHHGHHEGHCGGGGGGGHHHHHFHHGHGHHHHHHHHGHHHHGHHHGHHEHGHHHHHGHGHGHHHHHHHHHHGHHHHHHHHH0GHGHHGGGGF\n@M03610:15:000000000-ALE1U:1:1101:18865:1996 1:N:0:1\nGCTACAAAGATAATGATAGCGCTTATAGTTAGCTCGGTTTGCTAATTCGGTTTGACTAATATTATCCTTTAAATAATCTGTTTTCGCTTTTTTAGTCGGCGAAGGGGAACAAGCAAATAAAGTTGTCAGTGTTGAAATTAAAAAAATAAGT\n+\n>3A3>4@4C4FFBGFGGGGGGGGGGHGHHHHGGHHGGFGGGHHGHHHHGHGGGGEHHGGHHHHHHFHHHHFFHHHFHHHHHHHHHGGGHGHHGHGHHDCEGCEG?EGGGGHHHHHHHHHHHGHHHHGHHHHHHHHFFGHHEHHHGGHHHHH\n@M03610:15:000000000-ALE1U:1:1101:18806:2006 1:N:0:1\nGCGGATGGCTCGCCAAAAGTTGGCTCTTTACGAAAATTATTTTGTGACATTTAACTTTCCAATTTTAGGTGAAAATATAATGGGAAATTTCCCGCTGAATAAATTATCCCCATTTTAAAGTATTTCTCTTTAATCAGCACACGATTTTTCA\n+\n>>111>1AFFFDCEECGGGGGGHHHHHHHHHGFGC?GHFHHHHGGHHHHHHHHHHHHHHHHGHHHHHHGHHFHHHHHHHHGHGHHHHHHHBHHGGGGGHHHHHHHHHGHHGHHHHHHHHHEGHGHHHHGHHHHHHHFGGHGHGGHHGHHF2\n";
+    const std::string emptyReadData = "@Read1\n\n+\n\n";
     const std::string readTabData = "TESTOne\tACTG\t####\tTESTOne\tACTG\t####\nTestTwo\tACTG\t####\n";
     const std::string readDataInter = "@Whatever1\nAAAAAAA\n+\n#######\n@Whatever2\nGGGCCCT\n+\nBBBBBBB\n";
     const std::string fastaFile = ">1\nTACCCACACA\nTTTTACACACAACAC\n>2\nACGATGACA\n";
@@ -71,6 +72,19 @@ TEST_F(ReadsTest, parseSingleReadFastq) {
     ASSERT_EQ(read_count, 5u);
 }
 
+TEST_F(ReadsTest, parseSingleReadFastqZeroLengthSequence) {
+    std::istringstream in1(emptyReadData);
+    InputReader<SingleEndRead, SingleEndReadFastqImpl> ifs(in1);
+
+    ASSERT_TRUE(ifs.has_next());
+    auto r = ifs.next();
+
+    ASSERT_EQ(0u, r->get_read().getLength());
+    ASSERT_EQ("", r->get_read().get_seq());
+    ASSERT_EQ("", r->get_read().get_qual());
+    ASSERT_FALSE(ifs.has_next());
+}
+
 TEST_F(ReadsTest, parsePairedReadFastq) {
     std::istringstream in1(readData);
     std::istringstream in2(readData);

hts_AdapterTrimmer/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_CutTrim/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_ExtractUMI/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_LengthFilter/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_NTrimmer/CMakeLists.txt

@@ -8,7 +8,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_Overlapper/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_PolyATTrim/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_Primers/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_QWindowTrim/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_SeqScreener/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_SeqScreener/src/hts_SeqScreener.h

@@ -108,7 +108,7 @@ class SeqScreenerCounters : public Counters {
 class dbhash {
 public:
     std::size_t operator() ( const boost::dynamic_bitset<>& bs) const {
-        return boost::hash_value(bs.m_bits);
+        return boost::hash_value(bs);
     }
 };
 

hts_Stats/CMakeLists.txt

@@ -8,7 +8,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 find_package(Threads REQUIRED)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 

hts_Stats/src/hts_Stats.h

@@ -131,21 +131,21 @@ class StatsCounters : public Counters {
 
     void write_out() {
         std::vector<Vector> iSE_Length;
-        for (size_t i = 1; i < SE_Length.size(); ++i) {
+        for (size_t i = 0; i < SE_Length.size(); ++i) {
             if (SE_Length[i] > 0) {
                 iSE_Length.push_back(std::forward_as_tuple(i, SE_Length[i]));
             }
         }
 
         std::vector<Vector> iR1_Length;
-        for (size_t i = 1; i < R1_Length.size(); ++i) {
+        for (size_t i = 0; i < R1_Length.size(); ++i) {
             if (R1_Length[i] > 0) {
                 iR1_Length.push_back(std::forward_as_tuple(i, R1_Length[i]));
             }
         }
 
         std::vector<Vector> iR2_Length;
-        for (size_t i = 1; i < R2_Length.size(); ++i) {
+        for (size_t i = 0; i < R2_Length.size(); ++i) {
             if (R2_Length[i] > 0) {
                 iR2_Length.push_back(std::forward_as_tuple(i, R2_Length[i]));
             }

hts_Stats/test/hts_TestStats.cpp

@@ -1,6 +1,9 @@
 #include "gtest/gtest.h"
+#include <cstdio>
+#include <fstream>
 #include <sstream>
 #include <iostream>
+#include <unistd.h>
 #include <boost/program_options.hpp>
 #include "hts_Stats.h"
 
@@ -11,6 +14,7 @@ class StatsTest : public ::testing::Test {
         po::variables_map vm;
         const std::string readData_1 = "@Read1\nACTGAC\n+\nI#I#AH\n";
         const std::string readData_2 = "@Read2\nACTGAC\n+\nI#IIDH\n";
+        const std::string readData_empty = "@Read0\n\n+\n\n";
 };
 
 TEST_F(StatsTest, BasicTrim) {
@@ -40,3 +44,62 @@ TEST_F(StatsTest, BasicTrim) {
     ASSERT_EQ(1u, counters.R1_qualities[4][32]);
     ASSERT_EQ(0u, counters.R1_qualities[4][42]);
 };
+
+TEST_F(StatsTest, ZeroLengthRead) {
+    std::istringstream in1(readData_empty);
+
+    InputReader<SingleEndRead, SingleEndReadFastqImpl> ifs(in1);
+    StatsCounters counters("hts_Stats", vm);
+
+    ASSERT_TRUE(ifs.has_next());
+    auto i = ifs.next();
+    SingleEndRead *ser = dynamic_cast<SingleEndRead*>(i.get());
+    ASSERT_NE(nullptr, ser);
+
+    counters.input(*ser);
+    counters.output(*ser);
+
+    ASSERT_EQ(1u, counters.SE_In);
+    ASSERT_EQ(1u, counters.SE_Out);
+    ASSERT_EQ(1u, counters.TotalFragmentsInput);
+    ASSERT_EQ(1u, counters.TotalFragmentsOutput);
+    ASSERT_EQ(0u, counters.SE_BpLen_In);
+    ASSERT_EQ(0u, counters.TotalBasepairsInput);
+    ASSERT_EQ(1u, counters.SE_Length.size());
+    ASSERT_EQ(1u, counters.SE_Length[0]);
+    ASSERT_TRUE(counters.SE_bases.empty());
+    ASSERT_TRUE(counters.SE_qualities.empty());
+}
+
+TEST_F(StatsTest, ZeroLengthReadWrittenToHistogram) {
+    std::istringstream in1(readData_empty);
+
+    InputReader<SingleEndRead, SingleEndReadFastqImpl> ifs(in1);
+    StatsCounters counters("hts_Stats", vm);
+
+    ASSERT_TRUE(ifs.has_next());
+    auto i = ifs.next();
+    SingleEndRead *ser = dynamic_cast<SingleEndRead*>(i.get());
+    ASSERT_NE(nullptr, ser);
+
+    counters.input(*ser);
+    counters.output(*ser);
+
+    char stats_template[] = "/tmp/hts_stats_zero_length_XXXXXX";
+    int fd = mkstemp(stats_template);
+    ASSERT_NE(-1, fd);
+    close(fd);
+    counters.fStats = stats_template;
+
+    counters.write_out();
+
+    std::ifstream stats_file(stats_template);
+    ASSERT_TRUE(stats_file.is_open());
+    std::stringstream buffer;
+    buffer << stats_file.rdbuf();
+    stats_file.close();
+
+    ASSERT_NE(std::string::npos, buffer.str().find("\"readlength_histogram\": [ [0,1] ]"));
+
+    std::remove(stats_template);
+}

hts_SuperDeduper/CMakeLists.txt

@@ -7,7 +7,7 @@ message( status "sources: " ${sources})
 set(PROJECT_LINK_LIBS hts_common)
 link_directories(${CMAKE_BINARY_DIR}/common)
 
-FIND_PACKAGE( Boost 1.70 COMPONENTS system program_options iostreams filesystem REQUIRED )
+find_package(Boost 1.70 MODULE REQUIRED COMPONENTS program_options iostreams filesystem)
 include_directories(${COMMON_INCLUDES} ${Boost_INCLUDE_DIR} )
 
 

hts_SuperDeduper/src/hts_SuperDeduper.h

@@ -88,7 +88,7 @@ class SuperDeduperCounters : public Counters {
 class dbhash {
 public:
     std::size_t operator() (const boost::dynamic_bitset<>& bs) const {
-        return boost::hash_value(bs.m_bits);
+        return boost::hash_value(bs);
     }
 };