Merge a6bd4dd into 1e21f31

AztecProtocol · Dec 9, 2024 · a262577 · a262577
2 parents 1e21f31 + a6bd4dd
commit a262577
Show file tree

Hide file tree

Showing 50 changed files with 478 additions and 979 deletions.
diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json
@@ -223,7 +223,8 @@
       "binaryDir": "build-gcc",
       "environment": {
         "CC": "gcc",
-        "CXX": "g++"
+        "CXX": "g++",
+        "CXXFLAGS": "-Wno-missing-field-initializers"
       }
     },
     {
@@ -233,7 +234,8 @@
       "inherits": "default",
       "environment": {
         "CC": "gcc-10",
-        "CXX": "g++-10"
+        "CXX": "g++-10",
+        "CXXFLAGS": "-Wno-missing-field-initializers"
       }
     },
     {
@@ -243,7 +245,8 @@
       "inherits": "default",
       "environment": {
         "CC": "gcc-13",
-        "CXX": "g++-13"
+        "CXX": "g++-13",
+        "CXXFLAGS": "-Wno-missing-field-initializers"
       }
     },
     {

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE
-#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
+#include "circuit_builder.hpp"
 
 #include <mutex>
 #include <set>

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.hpp
@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "barretenberg/vm/avm/generated/flavor.hpp"
-#include "barretenberg/vm/avm/generated/full_row.hpp"
+#include "flavor.hpp"
+#include "full_row.hpp"
 
 namespace bb {
 

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/columns.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/columns.hpp
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/composer.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/composer.cpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE
-#include "barretenberg/vm/avm/generated/composer.hpp"
+#include "composer.hpp"
 #include "barretenberg/vm/stats.hpp"
 
 namespace bb {

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/composer.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/composer.hpp
@@ -2,9 +2,9 @@
 #pragma once
 
 #include "barretenberg/srs/global_crs.hpp"
-#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
-#include "barretenberg/vm/avm/generated/prover.hpp"
-#include "barretenberg/vm/avm/generated/verifier.hpp"
+#include "circuit_builder.hpp"
+#include "prover.hpp"
+#include "verifier.hpp"
 
 namespace bb {
 

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE
-#include "barretenberg/vm/avm/generated/flavor.hpp"
+#include "flavor.hpp"
 
 namespace bb {
 

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp
@@ -1,8 +1,8 @@
 // AUTOGENERATED FILE
-#include "barretenberg/vm/avm/generated/full_row.hpp"
-#include "barretenberg/vm/avm/generated/flavor_settings.hpp"
+#include "full_row.hpp"
+#include "flavor_settings.hpp"
 
-namespace bb {
+namespace bb::avm {
 namespace {
 
 template <typename FF> std::string field_to_string(const FF& ff)
@@ -1568,4 +1568,4 @@ template std::ostream& operator<<(std::ostream& os, AvmFullRow<AvmFlavorSettings
 template std::vector<std::string> AvmFullRow<AvmFlavorSettings::FF>::names();
 template RefVector<const AvmFlavorSettings::FF> AvmFullRow<AvmFlavorSettings::FF>::as_vector() const;
 
-} // namespace bb
+} // namespace bb::avm