From bbfb9925663f05019c161dc37b60c95a12db3b5a Mon Sep 17 00:00:00 2001 From: fche Date: Mon, 27 Mar 2006 20:30:06 +0000 Subject: [PATCH] 2006-03-27 Frank Ch. Eigler * sidcpuutil.h (basic_cpu::{read,write}_watchpoint_memory): Remove extra class qualification. * sidattrutil.h (configurable_component::nothing): Ditto. --- sid/include/ChangeLog | 6 ++++++ sid/include/sidattrutil.h | 2 +- sid/include/sidcpuutil.h | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sid/include/ChangeLog b/sid/include/ChangeLog index a88b894e6e..0a0d05fc20 100644 --- a/sid/include/ChangeLog +++ b/sid/include/ChangeLog @@ -1,3 +1,9 @@ +2006-03-27 Frank Ch. Eigler + + * sidcpuutil.h (basic_cpu::{read,write}_watchpoint_memory): Remove + extra class qualification. + * sidattrutil.h (configurable_component::nothing): Ditto. + 2005-11-14 Dave Brolley * sidcpuutil.h (basic_cpu::pin_factory): Parse, recognize and add diff --git a/sid/include/sidattrutil.h b/sid/include/sidattrutil.h index 266f81ef58..4f2f56dd27 100644 --- a/sid/include/sidattrutil.h +++ b/sid/include/sidattrutil.h @@ -1035,7 +1035,7 @@ make_attribute (const sid::any_int& value) // Dynamic reconfiguration support private: - std::string configurable_component::nothing() { return ""; } + std::string nothing() { return ""; } protected: virtual component::status dynamic_config(const std::string& spec) diff --git a/sid/include/sidcpuutil.h b/sid/include/sidcpuutil.h index d65b50a638..ed0b1ea9a1 100644 --- a/sid/include/sidcpuutil.h +++ b/sid/include/sidcpuutil.h @@ -775,7 +775,7 @@ namespace sidutil virtual void record_data_memory_read_latency (sid::bus::status s) { total_latency += s.latency; } virtual void record_data_memory_write_latency (sid::bus::status s) { total_latency += s.latency; } - virtual std::string basic_cpu::read_watchpoint_memory (std::pair addr_and_length) + virtual std::string read_watchpoint_memory (std::pair addr_and_length) { // Extract the address and length from the argument. sid::host_int_4 address = addr_and_length.first; @@ -816,7 +816,7 @@ namespace sidutil return ""; } - virtual sid::component::status basic_cpu::write_watchpoint_memory (std::pair addr_and_length, const std::string &value) + virtual sid::component::status write_watchpoint_memory (std::pair addr_and_length, const std::string &value) { return sid::component::bad_value; } -- 2.11.0