Include fixes

Fixed missing includes for tracable and made fmt header-only

incl/scc/register.h

@@ -20,6 +20,7 @@
 #include <memory>
 
 #include "resetable.h"
+#include "traceable.h"
 #include "resource_access_if.h"
 #include "util/delegate.h"
 #include "utilities.h"
@@ -234,7 +235,7 @@ public:
      *
      * @param write_cb
      */
-    void set_write_cb(std::function<bool(this_type &, DATATYPE &)> write_cb) {
+    void set_write_cb(std::function<bool(this_type &, const DATATYPE &)> write_cb) {
         wr_cb = [write_cb](this_type &reg, DATATYPE &data, sc_core::sc_time delay) { return write_cb(reg, data); };
     }
     /**
@@ -242,7 +243,7 @@ public:
      *
      * @param write_cb
      */
-    void set_write_cb(std::function<bool(this_type &, DATATYPE &, sc_core::sc_time)> write_cb) { wr_cb = write_cb; }
+    void set_write_cb(std::function<bool(this_type &, const DATATYPE &, sc_core::sc_time)> write_cb) { wr_cb = write_cb; }
     /**
      * trace the register value to the given trace file
      *

incl/util/logging.h

@@ -81,7 +81,8 @@ public:
         os << std::endl;
         T::output(os.str());
         // TODO: use a more specific exception
-        if (get_last_log_level() == FATAL && abort_on_fatal()) throw std::runtime_error(os.str());
+        if (get_last_log_level() == FATAL && abort_on_fatal())
+            abort();
     }
     /**
      * get the underlying ostringstream for a certain log level and category

src/CMakeLists.txt

@@ -46,7 +46,7 @@ if(SCV_FOUND)
     add_definitions(-DWITH_SCV)
 	target_include_directories (${LIBRARY_NAME} PUBLIC ${SCV_INCLUDE_DIRS})
     target_link_libraries (${LIBRARY_NAME} ${SCV_LIBRARIES})
-    target_link_libraries (${LIBRARY_NAME} fmt)
+#    target_link_libraries (${LIBRARY_NAME} fmt)
 endif()
 set_target_properties(${LIBRARY_NAME} PROPERTIES
   VERSION ${VERSION}  # ${VERSION} was defined in the main CMakeLists.

src/configurable_tracer.cpp

@@ -32,6 +32,7 @@
  ******************************************************************************/
 
 #include "scc/configurable_tracer.h"
+#include "scc/traceable.h"
 
 using namespace scc;
 

src/scv_tr_sqlite/scv_tr_sqlite.cpp

@@ -20,6 +20,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#define FMT_HEADER_ONLY
 #include <fmt/format.h>
 // clang-format off
 #include "scv/scv_util.h"

src/tracer_base.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "scc/tracer_base.h"
+#include "scc/traceable.h"
 #include <string.h>
 
 

src/value_registry.cpp

@@ -9,6 +9,7 @@
 #include <sysc/datatypes/fx/sc_fxval.h>
 #include <sysc/datatypes/fx/sc_fxnum.h>
 #include <string>
+#include <cstring>
 #include <sstream>
 #include <unordered_map>