From d01a0c3251c4c99dd0479f68c610d5e020229e2a Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 6 Oct 2017 06:47:07 +0200
Subject: [PATCH] Fixed compile issues with upcoming SystemC 2.3.2

---
 riscv.sc/gen_input/fe310.rdl | 2 +-
 riscv.sc/src/sc_main.cpp     | 5 ++---
 sc-components                | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/riscv.sc/gen_input/fe310.rdl b/riscv.sc/gen_input/fe310.rdl
index 20428c0..4c9a037 100644
--- a/riscv.sc/gen_input/fe310.rdl
+++ b/riscv.sc/gen_input/fe310.rdl
@@ -14,6 +14,6 @@ addrmap e300_plat_t {
     prci_regs  prci  @0x10008000;
     gpio_regs  gpio  @0x10012000;
     uart_regs  uart0 @0x10013000;
-    uart_regs  uart1 @0x10023000;
     spi_regs   spi   @0x10014000;  
+    uart_regs  uart1 @0x10023000;
 } e300_plat;
diff --git a/riscv.sc/src/sc_main.cpp b/riscv.sc/src/sc_main.cpp
index 8988b82..3e723da 100644
--- a/riscv.sc/src/sc_main.cpp
+++ b/riscv.sc/src/sc_main.cpp
@@ -23,7 +23,6 @@
 #include <boost/program_options.hpp>
 #include <iss/jit/MCJIThelper.h>
 #include <iss/log_categories.h>
-#include <sr_report/sr_report.h>
 #include <sstream>
 #include <sysc/SiFive/platform.h>
 #include "scc/configurer.h"
@@ -137,7 +136,7 @@ int sc_main(int argc, char *argv[]) {
     ///////////////////////////////////////////////////////////////////////////
     // run simulation
     ///////////////////////////////////////////////////////////////////////////
-    sc_start();
-    if (!sc_end_of_simulation_invoked()) sc_stop();
+    sc_core::sc_start();
+    if (!sc_core::sc_end_of_simulation_invoked()) sc_core::sc_stop();
     return 0;
 }
diff --git a/sc-components b/sc-components
index 2629710..7b45d22 160000
--- a/sc-components
+++ b/sc-components
@@ -1 +1 @@
-Subproject commit 26297107a0f1a36b320ff26e41cd42e808841321
+Subproject commit 7b45d22eb3431f09c318938fc11f83088318a9d3