39a40
> #include "systemc/ext/core/messages.hh"
81c82,83
< SC_REPORT_WARNING("(W505) object already exists", message.c_str());
---
> SC_REPORT_WARNING(sc_core::SC_ID_INSTANCE_EXISTS_,
> message.c_str());
162,165c164,165
< if (scheduler.inUpdate()) {
< SC_REPORT_ERROR("(E521) immediate notification is not allowed "
< "during update phase or elaboration", "");
< }
---
> if (scheduler.inUpdate())
> SC_REPORT_ERROR(sc_core::SC_ID_IMMEDIATE_NOTIFICATION_, "");
193,196c193,194
< if (delayedNotify.scheduled()) {
< SC_REPORT_ERROR("(E531) notify_delayed() cannot be called on events "
< "that have pending notifications", "");
< }
---
> if (delayedNotify.scheduled())
> SC_REPORT_ERROR(sc_core::SC_ID_NOTIFY_DELAYED_, "");