diff options
author | Aman Goel <amangoel@umich.edu> | 2018-08-18 08:18:40 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-18 08:18:40 +0530 |
commit | 61f002c908830d59e883d25668b731e7d12470d0 (patch) | |
tree | 25174f7321f60e14ca6c144544f29971c40abe9b /frontends/json | |
parent | 5dcb899e76a82c8aa84552a59f4a9f64394e7785 (diff) | |
parent | e343f3e6d475984c21611474bffe7dcd8f599497 (diff) | |
download | yosys-61f002c908830d59e883d25668b731e7d12470d0.tar.gz yosys-61f002c908830d59e883d25668b731e7d12470d0.tar.bz2 yosys-61f002c908830d59e883d25668b731e7d12470d0.zip |
Merge pull request #3 from YosysHQ/master
Updates from official repo
Diffstat (limited to 'frontends/json')
-rw-r--r-- | frontends/json/jsonparse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/json/jsonparse.cc b/frontends/json/jsonparse.cc index 629578c61..82361ea9b 100644 --- a/frontends/json/jsonparse.cc +++ b/frontends/json/jsonparse.cc @@ -494,7 +494,7 @@ void json_import(Design *design, string &modname, JsonNode *node) struct JsonFrontend : public Frontend { JsonFrontend() : Frontend("json", "read JSON file") { } - virtual void help() + void help() YS_OVERRIDE { // |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---| log("\n"); @@ -504,7 +504,7 @@ struct JsonFrontend : public Frontend { log("for a description of the file format.\n"); log("\n"); } - virtual void execute(std::istream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) + void execute(std::istream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE { log_header(design, "Executing JSON frontend.\n"); |