Pacify GCC build

darktable-org · Apr 10, 2024 · fc20909 · fc20909
1 parent 1d81780
commit fc20909
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 23 deletions.
diff --git a/src/librawspeed/bitstreams/BitStreamJPEG.h b/src/librawspeed/bitstreams/BitStreamJPEG.h
@@ -29,7 +29,7 @@
 namespace rawspeed {
 
 template <> struct BitStreamTraits<BitOrder::JPEG> final {
-  static constexpr BitOrder BitOrder = BitOrder::JPEG;
+  static constexpr BitOrder Tag = BitOrder::JPEG;
 
   using StreamFlow = BitStreamCacheRightInLeftOut;
 

diff --git a/src/librawspeed/bitstreams/BitStreamLSB.h b/src/librawspeed/bitstreams/BitStreamLSB.h
@@ -29,7 +29,7 @@
 namespace rawspeed {
 
 template <> struct BitStreamTraits<BitOrder::LSB> final {
-  static constexpr BitOrder BitOrder = BitOrder::LSB;
+  static constexpr BitOrder Tag = BitOrder::LSB;
 
   using StreamFlow = BitStreamCacheLeftInRightOut;
 

diff --git a/src/librawspeed/bitstreams/BitStreamMSB.h b/src/librawspeed/bitstreams/BitStreamMSB.h
@@ -29,7 +29,7 @@
 namespace rawspeed {
 
 template <> struct BitStreamTraits<BitOrder::MSB> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB;
+  static constexpr BitOrder Tag = BitOrder::MSB;
 
   using StreamFlow = BitStreamCacheRightInLeftOut;
 

diff --git a/src/librawspeed/bitstreams/BitStreamMSB16.h b/src/librawspeed/bitstreams/BitStreamMSB16.h
@@ -29,7 +29,7 @@
 namespace rawspeed {
 
 template <> struct BitStreamTraits<BitOrder::MSB16> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB16;
+  static constexpr BitOrder Tag = BitOrder::MSB16;
 
   using StreamFlow = BitStreamCacheRightInLeftOut;
 

diff --git a/src/librawspeed/bitstreams/BitStreamMSB32.h b/src/librawspeed/bitstreams/BitStreamMSB32.h
@@ -29,7 +29,7 @@
 namespace rawspeed {
 
 template <> struct BitStreamTraits<BitOrder::MSB32> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB32;
+  static constexpr BitOrder Tag = BitOrder::MSB32;
 
   using StreamFlow = BitStreamCacheRightInLeftOut;
 

diff --git a/src/librawspeed/bitstreams/BitStreamer.h b/src/librawspeed/bitstreams/BitStreamer.h
@@ -43,7 +43,7 @@ template <typename Tag> struct BitStreamerReplenisherBase {
   using size_type = int32_t;
 
   using Traits = BitStreamerTraits<Tag>;
-  using StreamTraits = BitStreamTraits<Traits::BitOrder>;
+  using StreamTraits = BitStreamTraits<Traits::Tag>;
 
   Array1DRef<const std::byte> input;
   int pos = 0;
@@ -74,7 +74,7 @@ struct BitStreamerForwardSequentialReplenisher final
     : public BitStreamerReplenisherBase<Tag> {
   using Base = BitStreamerReplenisherBase<Tag>;
   using Traits = BitStreamerTraits<Tag>;
-  using StreamTraits = BitStreamTraits<Traits::BitOrder>;
+  using StreamTraits = BitStreamTraits<Traits::Tag>;
 
   using Base::BitStreamerReplenisherBase;
 
@@ -138,7 +138,7 @@ class BitStreamer {
 public:
   using size_type = int32_t;
   using Traits = BitStreamerTraits<Derived>;
-  using StreamTraits = BitStreamTraits<Traits::BitOrder>;
+  using StreamTraits = BitStreamTraits<Traits::Tag>;
 
   using Cache = typename StreamTraits::StreamFlow;
 

diff --git a/src/librawspeed/bitstreams/BitStreamerJPEG.h b/src/librawspeed/bitstreams/BitStreamerJPEG.h
@@ -68,7 +68,7 @@ class PosOrUnknown final {
 class BitStreamerJPEG;
 
 template <> struct BitStreamerTraits<BitStreamerJPEG> final {
-  static constexpr BitOrder BitOrder = BitOrder::JPEG;
+  static constexpr BitOrder Tag = BitOrder::JPEG;
 
   static constexpr bool canUseWithPrefixCodeDecoder = true;
 

diff --git a/src/librawspeed/bitstreams/BitStreamerLSB.h b/src/librawspeed/bitstreams/BitStreamerLSB.h
@@ -29,7 +29,7 @@ namespace rawspeed {
 class BitStreamerLSB;
 
 template <> struct BitStreamerTraits<BitStreamerLSB> final {
-  static constexpr BitOrder BitOrder = BitOrder::LSB;
+  static constexpr BitOrder Tag = BitOrder::LSB;
 
   // How many bytes can we read from the input per each fillCache(), at most?
   static constexpr int MaxProcessBytes = 4;

diff --git a/src/librawspeed/bitstreams/BitStreamerMSB.h b/src/librawspeed/bitstreams/BitStreamerMSB.h
@@ -29,7 +29,7 @@ namespace rawspeed {
 class BitStreamerMSB;
 
 template <> struct BitStreamerTraits<BitStreamerMSB> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB;
+  static constexpr BitOrder Tag = BitOrder::MSB;
 
   static constexpr bool canUseWithPrefixCodeDecoder = true;
 

diff --git a/src/librawspeed/bitstreams/BitStreamerMSB16.h b/src/librawspeed/bitstreams/BitStreamerMSB16.h
@@ -29,7 +29,7 @@ namespace rawspeed {
 class BitStreamerMSB16;
 
 template <> struct BitStreamerTraits<BitStreamerMSB16> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB16;
+  static constexpr BitOrder Tag = BitOrder::MSB16;
 
   // How many bytes can we read from the input per each fillCache(), at most?
   static constexpr int MaxProcessBytes = 4;

diff --git a/src/librawspeed/bitstreams/BitStreamerMSB32.h b/src/librawspeed/bitstreams/BitStreamerMSB32.h
@@ -29,7 +29,7 @@ namespace rawspeed {
 class BitStreamerMSB32;
 
 template <> struct BitStreamerTraits<BitStreamerMSB32> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB32;
+  static constexpr BitOrder Tag = BitOrder::MSB32;
 
   static constexpr bool canUseWithPrefixCodeDecoder = true;
 

diff --git a/src/librawspeed/bitstreams/BitVacuumer.h b/src/librawspeed/bitstreams/BitVacuumer.h
@@ -37,7 +37,7 @@ template <typename Derived_, typename OutputIterator_>
 class BitVacuumer {
 public:
   using Traits = BitVacuumerTraits<Derived_>;
-  using StreamTraits = BitStreamTraits<Traits::BitOrder>;
+  using StreamTraits = BitStreamTraits<Traits::Tag>;
 
   using Cache = typename StreamTraits::StreamFlow;
 

diff --git a/src/librawspeed/bitstreams/BitVacuumerJPEG.h b/src/librawspeed/bitstreams/BitVacuumerJPEG.h
@@ -35,7 +35,7 @@ template <typename OutputIterator> class BitVacuumerJPEG;
 
 template <typename OutputIterator>
 struct BitVacuumerTraits<BitVacuumerJPEG<OutputIterator>> final {
-  static constexpr BitOrder BitOrder = BitOrder::JPEG;
+  static constexpr BitOrder Tag = BitOrder::JPEG;
 
   static constexpr bool canUseWithPrefixCodeEncoder = true;
 };

diff --git a/src/librawspeed/bitstreams/BitVacuumerLSB.h b/src/librawspeed/bitstreams/BitVacuumerLSB.h
@@ -29,7 +29,7 @@ template <typename OutputIterator> class BitVacuumerLSB;
 
 template <typename OutputIterator>
 struct BitVacuumerTraits<BitVacuumerLSB<OutputIterator>> final {
-  static constexpr BitOrder BitOrder = BitOrder::LSB;
+  static constexpr BitOrder Tag = BitOrder::LSB;
 };
 
 template <typename OutputIterator>

diff --git a/src/librawspeed/bitstreams/BitVacuumerMSB.h b/src/librawspeed/bitstreams/BitVacuumerMSB.h
@@ -29,7 +29,7 @@ template <typename OutputIterator> class BitVacuumerMSB;
 
 template <typename OutputIterator>
 struct BitVacuumerTraits<BitVacuumerMSB<OutputIterator>> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB;
+  static constexpr BitOrder Tag = BitOrder::MSB;
 
   static constexpr bool canUseWithPrefixCodeEncoder = true;
 };

diff --git a/src/librawspeed/bitstreams/BitVacuumerMSB16.h b/src/librawspeed/bitstreams/BitVacuumerMSB16.h
@@ -29,7 +29,7 @@ template <typename OutputIterator> class BitVacuumerMSB16;
 
 template <typename OutputIterator>
 struct BitVacuumerTraits<BitVacuumerMSB16<OutputIterator>> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB16;
+  static constexpr BitOrder Tag = BitOrder::MSB16;
 };
 
 template <typename OutputIterator>

diff --git a/src/librawspeed/bitstreams/BitVacuumerMSB32.h b/src/librawspeed/bitstreams/BitVacuumerMSB32.h
@@ -29,7 +29,7 @@ template <typename OutputIterator> class BitVacuumerMSB32;
 
 template <typename OutputIterator>
 struct BitVacuumerTraits<BitVacuumerMSB32<OutputIterator>> final {
-  static constexpr BitOrder BitOrder = BitOrder::MSB32;
+  static constexpr BitOrder Tag = BitOrder::MSB32;
 
   static constexpr bool canUseWithPrefixCodeEncoder = true;
 };

diff --git a/test/librawspeed/bitstreams/BitVacuumerLSBTest.cpp b/test/librawspeed/bitstreams/BitVacuumerLSBTest.cpp
@@ -278,7 +278,7 @@ TEST(BitVacuumerLSBTest, DependencyBreaking) {
     bsRef.fill();
     bsRef.skipManyBits(numBitsToSkip);
 
-    BitStreamPosition<BitStreamerTraits::BitOrder> state;
+    BitStreamPosition<BitStreamerTraits::Tag> state;
     state.pos = bsRef.getInputPosition();
     state.fillLevel = bsRef.getFillLevel();
     const auto bsPos = getAsByteStreamPosition(state);

diff --git a/test/librawspeed/bitstreams/BitVacuumerMSB16Test.cpp b/test/librawspeed/bitstreams/BitVacuumerMSB16Test.cpp
@@ -275,7 +275,7 @@ TEST(BitVacuumerMSB16Test, DependencyBreaking) {
     bsRef.fill();
     bsRef.skipManyBits(numBitsToSkip);
 
-    BitStreamPosition<BitStreamerTraits::BitOrder> state;
+    BitStreamPosition<BitStreamerTraits::Tag> state;
     state.pos = bsRef.getInputPosition();
     state.fillLevel = bsRef.getFillLevel();
     const auto bsPos = getAsByteStreamPosition(state);

diff --git a/test/librawspeed/bitstreams/BitVacuumerMSB32Test.cpp b/test/librawspeed/bitstreams/BitVacuumerMSB32Test.cpp
@@ -278,7 +278,7 @@ TEST(BitVacuumerMSB32Test, DependencyBreaking) {
     bsRef.fill();
     bsRef.skipManyBits(numBitsToSkip);
 
-    BitStreamPosition<BitStreamerTraits::BitOrder> state;
+    BitStreamPosition<BitStreamerTraits::Tag> state;
     state.pos = bsRef.getInputPosition();
     state.fillLevel = bsRef.getFillLevel();
     const auto bsPos = getAsByteStreamPosition(state);

diff --git a/test/librawspeed/bitstreams/BitVacuumerMSBTest.cpp b/test/librawspeed/bitstreams/BitVacuumerMSBTest.cpp
@@ -278,7 +278,7 @@ TEST(BitVacuumerMSBTest, DependencyBreaking) {
     bsRef.fill();
     bsRef.skipManyBits(numBitsToSkip);
 
-    BitStreamPosition<BitStreamerTraits::BitOrder> state;
+    BitStreamPosition<BitStreamerTraits::Tag> state;
     state.pos = bsRef.getInputPosition();
     state.fillLevel = bsRef.getFillLevel();
     const auto bsPos = getAsByteStreamPosition(state);