Skip to content

Commit bc3fb65

Browse files
committed
Fix rebase
1 parent 61b6545 commit bc3fb65

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/EncodedBlocks.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,6 @@ CTFIOSize EncodedBlocks<H, N, W>::encodeRANSV1Inplace(const input_IT srcBegin, c
14311431

14321432
return {0, thisMetadata->getUncompressedSize(), thisMetadata->getCompressedSize()};
14331433
}; // namespace ctf
1434-
#endif
14351434

14361435
template <typename H, int N, typename W>
14371436
template <typename input_IT, typename buffer_T>

Utilities/rANS/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ o2_add_test(Serialize
187187
LABELS utils)
188188
target_compile_options(${TEST_SERIALIZE} PRIVATE ${RANS_TEST_ARCH})
189189

190-
if(${RANS_ENABLE_JSON})
191-
if (${ENABLE_RANS_BENCHMARK})
192-
190+
if (TARGET benchmark::benchmark)
193191
o2_add_header_only_library(libransBenchmark
194192
TARGETVARNAME LIB_RANS_BENCHMARK
195193
INTERFACE_LINK_LIBRARIES O2::rANS benchmark::benchmark)

0 commit comments

Comments
 (0)