vvp: Moved __vpiArrayBase::vpi_iterate to __vpiArayBase::vpi_array_base_iterate.

This commit is contained in:
Maciej Suminski 2014-11-20 16:32:00 +01:00
parent ea7fa24f9e
commit 9538501b54
3 changed files with 6 additions and 3 deletions

View File

@ -97,6 +97,7 @@ struct __vpiArray : public __vpiArrayBase, public __vpiHandle {
int vpi_get(int code);
char* vpi_get_str(int code);
vpiHandle vpi_handle(int code);
inline vpiHandle vpi_iterate(int code) { return vpi_array_base_iterate(code); }
vpiHandle vpi_index(int idx);
const char*name; /* Permanently allocated string */

View File

@ -21,7 +21,7 @@
#include "array_common.h"
vpiHandle __vpiArrayBase::vpi_iterate(int code)
vpiHandle __vpiArrayBase::vpi_array_base_iterate(int code)
{
switch (code) {
case vpiMemoryWord: {

View File

@ -548,8 +548,10 @@ struct __vpiArrayBase {
virtual void get_word_value(struct __vpiArrayWord*word, p_vpi_value vp) = 0;
virtual void put_word_value(struct __vpiArrayWord*word, p_vpi_value vp,
int flags) = 0;
virtual vpiHandle vpi_iterate(int code);
// vpi_iterate is already defined by vpiHandle, so to avoid problems with
// classes inheriting from vpiHandle and vpiArrayBase just share the common
// code in the following function
vpiHandle vpi_array_base_iterate(int code);
virtual void make_vals_words();
struct __vpiArrayWord*vals_words;