Fix some struct versus class warnings for vpiScope
This commit is contained in:
parent
63ad15ee2e
commit
8367285f3b
14
vvp/stop.cc
14
vvp/stop.cc
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2013 Stephen Williams (steve@icarus.com)
|
* Copyright (c) 2003-2015 Stephen Williams (steve@icarus.com)
|
||||||
*
|
*
|
||||||
* This source code is free software; you can redistribute it
|
* This source code is free software; you can redistribute it
|
||||||
* and/or modify it in source code form under the terms of the GNU
|
* and/or modify it in source code form under the terms of the GNU
|
||||||
|
|
@ -40,7 +40,7 @@
|
||||||
# include <cstdlib>
|
# include <cstdlib>
|
||||||
# include "ivl_alloc.h"
|
# include "ivl_alloc.h"
|
||||||
|
|
||||||
struct __vpiScope*stop_current_scope = 0;
|
class __vpiScope*stop_current_scope = 0;
|
||||||
bool stop_is_finish; /* When set, $stop acts like $finish (set in main.cc). */
|
bool stop_is_finish; /* When set, $stop acts like $finish (set in main.cc). */
|
||||||
int stop_is_finish_exit_code = 0;
|
int stop_is_finish_exit_code = 0;
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ static void cmd_call(unsigned argc, char*argv[])
|
||||||
the name in argv[idx+2]. Look in the current scope. */
|
the name in argv[idx+2]. Look in the current scope. */
|
||||||
|
|
||||||
for (unsigned tmp = 0 ; (tmp < ntable)&& !handle ; tmp += 1) {
|
for (unsigned tmp = 0 ; (tmp < ntable)&& !handle ; tmp += 1) {
|
||||||
struct __vpiScope*scope;
|
class __vpiScope*scope;
|
||||||
const char*name;
|
const char*name;
|
||||||
|
|
||||||
switch (table[tmp]->get_type_code()) {
|
switch (table[tmp]->get_type_code()) {
|
||||||
|
|
@ -228,7 +228,7 @@ static void cmd_list(unsigned, char*[])
|
||||||
printf("%u items in this scope:\n", ntable);
|
printf("%u items in this scope:\n", ntable);
|
||||||
for (unsigned idx = 0 ; idx < ntable ; idx += 1) {
|
for (unsigned idx = 0 ; idx < ntable ; idx += 1) {
|
||||||
|
|
||||||
struct __vpiScope*scope;
|
class __vpiScope*scope;
|
||||||
struct __vpiSignal*sig;
|
struct __vpiSignal*sig;
|
||||||
|
|
||||||
switch (table[idx]->get_type_code()) {
|
switch (table[idx]->get_type_code()) {
|
||||||
|
|
@ -324,7 +324,7 @@ static void cmd_push(unsigned argc, char* argv[])
|
||||||
__vpiHandle**table;
|
__vpiHandle**table;
|
||||||
unsigned ntable;
|
unsigned ntable;
|
||||||
|
|
||||||
struct __vpiScope*child = 0;
|
class __vpiScope*child = 0;
|
||||||
|
|
||||||
if (stop_current_scope) {
|
if (stop_current_scope) {
|
||||||
table = &stop_current_scope->intern[0];
|
table = &stop_current_scope->intern[0];
|
||||||
|
|
@ -339,7 +339,7 @@ static void cmd_push(unsigned argc, char* argv[])
|
||||||
if (table[tmp]->get_type_code() != vpiModule)
|
if (table[tmp]->get_type_code() != vpiModule)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
struct __vpiScope*cp = dynamic_cast<__vpiScope*>(table[tmp]);
|
class __vpiScope*cp = dynamic_cast<__vpiScope*>(table[tmp]);
|
||||||
|
|
||||||
/* This is a scope, and the name matches, then
|
/* This is a scope, and the name matches, then
|
||||||
report that I found the child. */
|
report that I found the child. */
|
||||||
|
|
@ -396,7 +396,7 @@ static void cmd_trace(unsigned argc, char*argv[])
|
||||||
|
|
||||||
static void cmd_where(unsigned, char*[])
|
static void cmd_where(unsigned, char*[])
|
||||||
{
|
{
|
||||||
struct __vpiScope*cur = stop_current_scope;
|
class __vpiScope*cur = stop_current_scope;
|
||||||
|
|
||||||
while (cur) {
|
while (cur) {
|
||||||
switch (cur->get_type_code()) {
|
switch (cur->get_type_code()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue