Merge branch 'master' into fix/docker-check

emsec · May 6, 2024 · 83825e7 · 83825e7
2 parents d9bbefe + 13eadc7
commit 83825e7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/.github/email-address-image.gif b/.github/email-address-image.gif
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ This repository contains a selection of curated plugins:
 A comprehensive documentation of HAL's features from a user perspective is available in our [Wiki](https://github.com/emsec/hal/wiki). In addition, we provide a full [C++ API](https://emsec.github.io/hal/doc/) and [Python API](https://emsec.github.io/hal/pydoc/) documentation.
 
 ## Slack, Contact and Support
-For all kinds of inquiries, please contact us using our dedicated e-mail address: [[email protected]](mailto:hal@mpi-sp.org).
+For all kinds of inquiries, please contact us using our dedicated e-mail address: ![email address image](https://raw.githubusercontent.com/emsec/hal/master/.github/email-address-image.gif "Mail")
 
 <a name="build-instructions"></a>
 # Build Instructions 

diff --git a/plugins/gui/src/graph_widget/layouters/graph_layouter.cpp b/plugins/gui/src/graph_widget/layouters/graph_layouter.cpp
@@ -778,7 +778,7 @@ namespace hal
         {
             iy0     = ityLast.key();
             int iy1 = itNext.key();
-            Q_ASSERT(iy1 == iy0 + 1);
+//            Q_ASSERT(iy1 == iy0 + 1);
             if (iy0 % 2 != 0)
             {
                 // netjunction -> endpoint

diff --git a/...ator/netlist_simulator_controller/include/netlist_simulator_controller/saleae_directory.h b/...ator/netlist_simulator_controller/include/netlist_simulator_controller/saleae_directory.h
@@ -28,6 +28,7 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
+#include <cstdint>
 
 // unfortunately std::filesystem::path is not available for all platforms
 #ifdef _WIN32

diff --git a/src/netlist/boolean_function/parser_standard.cpp b/src/netlist/boolean_function/parser_standard.cpp
@@ -5,6 +5,8 @@
 #include <boost/fusion/sequence/intrinsic/at_c.hpp>
 #include <boost/spirit/home/x3.hpp>
 
+#include <sstream>
+
 namespace hal
 {
     namespace BooleanFunctionParser

diff --git a/src/netlist/boolean_function/simplification_abc.cpp b/src/netlist/boolean_function/simplification_abc.cpp
@@ -5,6 +5,7 @@
 #include <boost/spirit/home/x3.hpp>
 #include <mutex>
 #include <string.h>
+#include <sstream>
 
 extern "C" {
 ////////////////////////////////////////////////////////////////////////////

diff --git a/src/netlist/boolean_function/types.cpp b/src/netlist/boolean_function/types.cpp
@@ -3,6 +3,7 @@
 #include <boost/spirit/home/x3.hpp>
 #include <mutex>
 #include <numeric>
+#include <sstream>
 
 namespace hal
 {