object.cc (13295:e71ae162b863) | object.cc (13317:36c574a4036e) |
---|---|
1/* 2 * Copyright 2018 Google, Inc. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are 6 * met: redistributions of source code must retain the above copyright 7 * notice, this list of conditions and the following disclaimer; 8 * redistributions in binary form must reproduce the above copyright --- 22 unchanged lines hidden (view full) --- 31 32#include <algorithm> 33#include <stack> 34 35#include "base/logging.hh" 36#include "systemc/core/event.hh" 37#include "systemc/core/module.hh" 38#include "systemc/core/scheduler.hh" | 1/* 2 * Copyright 2018 Google, Inc. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are 6 * met: redistributions of source code must retain the above copyright 7 * notice, this list of conditions and the following disclaimer; 8 * redistributions in binary form must reproduce the above copyright --- 22 unchanged lines hidden (view full) --- 31 32#include <algorithm> 33#include <stack> 34 35#include "base/logging.hh" 36#include "systemc/core/event.hh" 37#include "systemc/core/module.hh" 38#include "systemc/core/scheduler.hh" |
39#include "systemc/ext/core/messages.hh" |
|
39#include "systemc/ext/core/sc_module.hh" 40 41namespace sc_gem5 42{ 43 44namespace 45{ 46 --- 69 unchanged lines hidden (view full) --- 116 path = std::string(sc_p->basename()) + std::string(".") + path; 117 sc_p = sc_p->get_parent_object(); 118 } 119 120 if (_basename != original_name) { 121 std::string message = path + original_name + 122 ". Latter declaration will be renamed to " + 123 path + _basename; | 40#include "systemc/ext/core/sc_module.hh" 41 42namespace sc_gem5 43{ 44 45namespace 46{ 47 --- 69 unchanged lines hidden (view full) --- 117 path = std::string(sc_p->basename()) + std::string(".") + path; 118 sc_p = sc_p->get_parent_object(); 119 } 120 121 if (_basename != original_name) { 122 std::string message = path + original_name + 123 ". Latter declaration will be renamed to " + 124 path + _basename; |
124 SC_REPORT_WARNING("(W505) object already exists", message.c_str()); | 125 SC_REPORT_WARNING(sc_core::SC_ID_INSTANCE_EXISTS_, message.c_str()); |
125 } 126 _name = path + _basename; 127} 128 129Object::Object(sc_core::sc_object *_sc_obj, const Object &arg) : 130 Object(_sc_obj, arg._basename.c_str()) 131{} 132 --- 195 unchanged lines hidden --- | 126 } 127 _name = path + _basename; 128} 129 130Object::Object(sc_core::sc_object *_sc_obj, const Object &arg) : 131 Object(_sc_obj, arg._basename.c_str()) 132{} 133 --- 195 unchanged lines hidden --- |