Windows and amalgamation fixes

Rohde-Schwarz · Jan 10, 2024 · 8c50cc2 · 8c50cc2
1 parent 3fcc74d
commit 8c50cc2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/pubkey/classic_mceliece/cmce_encaps.cpp b/src/lib/pubkey/classic_mceliece/cmce_encaps.cpp
@@ -5,10 +5,10 @@
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 **/
-
-#include "botan/rng.h"
 #include <botan/internal/cmce_encaps.h>
 
+#include <botan/rng.h>
+
 namespace Botan {
 
 bitvector Classic_McEliece_Encryptor::encode(const Classic_McEliece_Parameters& params,

diff --git a/src/lib/pubkey/classic_mceliece/cmce_encaps.h b/src/lib/pubkey/classic_mceliece/cmce_encaps.h
@@ -9,9 +9,8 @@
 #ifndef BOTAN_CMCE_ENCAPS_H_
 #define BOTAN_CMCE_ENCAPS_H_
 
-#include <botan/pk_keys.h>
-
 #include <botan/cmce.h>
+#include <botan/pk_keys.h>
 #include <botan/internal/cmce_field_ordering.h>
 #include <botan/internal/cmce_keys_internal.h>
 #include <botan/internal/cmce_matrix.h>

diff --git a/src/lib/pubkey/classic_mceliece/cmce_field_ordering.cpp b/src/lib/pubkey/classic_mceliece/cmce_field_ordering.cpp
@@ -8,9 +8,9 @@
 #include <botan/internal/cmce_field_ordering.h>
 
 #include <botan/cmce.h>
+#include <botan/mem_ops.h>
 #include <botan/internal/loadstor.h>
 
-#include <botan/mem_ops.h>
 #include <iostream>
 #include <numeric>
 #include <utility>

diff --git a/src/lib/pubkey/classic_mceliece/cmce_field_ordering.h b/src/lib/pubkey/classic_mceliece/cmce_field_ordering.h
@@ -10,6 +10,7 @@
 #define BOTAN_CMCE_FIELD_ORDERING_H_
 
 #include <botan/internal/cmce_parameters.h>
+
 #include <numeric>
 
 namespace Botan {

diff --git a/src/lib/utils/bitvector.h b/src/lib/utils/bitvector.h
@@ -827,7 +827,7 @@ class bitvector_base final {
                         return false;
                      }
                   } else if constexpr(is_manipulator) {
-                     detail::first(ops...).template store_next(apply(fn, bits, ops.template load_next<BlockT>()...));
+                     detail::first(ops...).store_next(apply(fn, bits, ops.template load_next<BlockT>()...));
                   } else {
                      apply(fn, bits, ops.template load_next<BlockT>()...);
                   }