diff options
| author | Gabe Black <gabeblack@google.com> | 2019-01-22 17:48:12 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-01-23 09:52:52 +0000 |
| commit | e1ef0270da9626bd45f4ad1375c9a3d8bccd6fa7 (patch) | |
| tree | 319c25a9948fbe6af2b31b3e390a940d284fa3f9 /src/systemc/tlm_utils | |
| parent | 298e8b833fe6183a435067361285b9e832a7e94a (diff) | |
| download | gem5-e1ef0270da9626bd45f4ad1375c9a3d8bccd6fa7.tar.xz | |
systemc: Fix TLM related includes.
There are a couple things this CL fixes related to the TLM #includes.
1. Removes #includes of <systemc> and <tlm>. These bring in a header
file from boost which shouldn't be necessary but which some of the
tests (and likely some external code) depends on. We avoid including
those in files built into gem5 itself so that gem5 isn't dependent on
boost.
2. All includes in ext should be relative. That way those headers can
be removed from gem5 and still build, allowing them to be moved over
to or referenced from a foreign codebase which isn't part of gem5.
Change-Id: I76e267385b48cb4fe93aea89ec8319c76465a0a4
Reviewed-on: https://gem5-review.googlesource.com/c/15796
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/tlm_utils')
| -rw-r--r-- | src/systemc/tlm_utils/convenience_socket_bases.cc | 5 | ||||
| -rw-r--r-- | src/systemc/tlm_utils/instance_specific_extensions.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/systemc/tlm_utils/convenience_socket_bases.cc b/src/systemc/tlm_utils/convenience_socket_bases.cc index ba38d6c79..93b814c56 100644 --- a/src/systemc/tlm_utils/convenience_socket_bases.cc +++ b/src/systemc/tlm_utils/convenience_socket_bases.cc @@ -20,7 +20,10 @@ #include <tlm_utils/convenience_socket_bases.h> #include <sstream> -#include <systemc> + +#include "systemc/ext/core/sc_object.hh" +#include "systemc/ext/core/sc_simcontext.hh" +#include "systemc/ext/utils/sc_report_handler.hh" namespace tlm_utils { diff --git a/src/systemc/tlm_utils/instance_specific_extensions.cc b/src/systemc/tlm_utils/instance_specific_extensions.cc index 91610dd02..62c6aa0da 100644 --- a/src/systemc/tlm_utils/instance_specific_extensions.cc +++ b/src/systemc/tlm_utils/instance_specific_extensions.cc @@ -21,8 +21,6 @@ #include <iostream> #include <map> -#include <systemc> -#include <tlm> #include <typeindex> namespace tlm |