Merge 'origin/master' into auto-plusargs

2018-01-16 15:45:53 -05:00
parent 04af785a5f 80ca018e3a
commit 355d3b15e8
2 changed files with 3 additions and 1 deletions
--- a/csrc/verilator.h
+++ b/csrc/verilator.h
@ -12,7 +12,7 @@ class VerilatedVcdFILE : public VerilatedVcdFile {
 public:
  VerilatedVcdFILE(FILE* file) : file(file) {}
  ~VerilatedVcdFILE() {}
-  bool open(const string& name) override {
+  bool open(const std::string& name) override {
    // file should already be open
    return file != NULL;
  }