From 7abc220fb3ed4e668454fcf0612f7c1b912cb581 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sun, 4 Oct 2015 13:41:45 -0400
Subject: [PATCH] Fix C++ 2014 compile warnings. No functional change.

---
 src/V3Ast.cpp     | 2 +-
 src/V3Cdc.cpp     | 2 +-
 src/V3File.cpp    | 2 +-
 src/V3Graph.cpp   | 2 +-
 src/V3Hashed.cpp  | 2 +-
 src/V3Options.cpp | 2 +-
 src/V3Order.cpp   | 2 +-
 src/V3SymTable.h  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp
index 8af35cdac..3a1f90cb7 100644
--- a/src/V3Ast.cpp
+++ b/src/V3Ast.cpp
@@ -1031,7 +1031,7 @@ void AstNode::dumpTreeFile(const string& filename, bool append, bool doDump) {
     if (doDump) {
 	{   // Write log & close
 	    UINFO(2,"Dumping "<<filename<<endl);
-	    const auto_ptr<ofstream> logsp (V3File::new_ofstream(filename, append));
+	    const VL_UNIQUE_PTR<ofstream> logsp (V3File::new_ofstream(filename, append));
 	    if (logsp->fail()) v3fatalSrc("Can't write "<<filename);
 	    *logsp<<"Verilator Tree Dump (format 0x3900) from <e"<<dec<<editCountLast()<<">";
 	    *logsp<<" to <e"<<dec<<editCountGbl()<<">"<<endl;
diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp
index 1808daee6..1886ef484 100644
--- a/src/V3Cdc.cpp
+++ b/src/V3Cdc.cpp
@@ -496,7 +496,7 @@ private:
 	}
 
 	string filename = v3Global.opt.makeDir()+"/"+v3Global.opt.prefix()+"__cdc_edges.txt";
-	const auto_ptr<ofstream> ofp (V3File::new_ofstream(filename));
+	const VL_UNIQUE_PTR<ofstream> ofp (V3File::new_ofstream(filename));
 	if (ofp->fail()) v3fatalSrc("Can't write "<<filename);
 	*ofp<<"Edge Report for "<<v3Global.opt.prefix()<<endl;
 
diff --git a/src/V3File.cpp b/src/V3File.cpp
index 60a3b31c3..c6deb9512 100644
--- a/src/V3File.cpp
+++ b/src/V3File.cpp
@@ -185,7 +185,7 @@ inline void V3FileDependImp::writeTimes(const string& filename, const string& cm
 }
 
 inline bool V3FileDependImp::checkTimes(const string& filename, const string& cmdlineIn) {
-    const auto_ptr<ifstream> ifp (V3File::new_ifstream_nodepend(filename));
+    const VL_UNIQUE_PTR<ifstream> ifp (V3File::new_ifstream_nodepend(filename));
     if (ifp->fail()) {
 	UINFO(2,"   --check-times failed: no input "<<filename<<endl);
 	return false;
diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp
index f219f1e2c..1125d1f2c 100644
--- a/src/V3Graph.cpp
+++ b/src/V3Graph.cpp
@@ -288,7 +288,7 @@ void V3Graph::dumpDotFilePrefixedAlways(const string& nameComment, bool colorAsS
 void V3Graph::dumpDotFile(const string& filename, bool colorAsSubgraph) {
     // This generates a file used by graphviz, http://www.graphviz.org
     // "hardcoded" parameters:
-    const auto_ptr<ofstream> logp (V3File::new_ofstream(filename));
+    const VL_UNIQUE_PTR<ofstream> logp (V3File::new_ofstream(filename));
     if (logp->fail()) v3fatalSrc("Can't write "<<filename);
 
     // Header
diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp
index 06b0feb3b..814974ee5 100644
--- a/src/V3Hashed.cpp
+++ b/src/V3Hashed.cpp
@@ -140,7 +140,7 @@ void V3Hashed::dumpFilePrefixed(const string& nameComment, bool tree) {
 }
 
 void V3Hashed::dumpFile(const string& filename, bool tree) {
-    const auto_ptr<ofstream> logp (V3File::new_ofstream(filename));
+    const VL_UNIQUE_PTR<ofstream> logp (V3File::new_ofstream(filename));
     if (logp->fail()) v3fatalSrc("Can't write "<<filename);
 
     map<int,int> dist;
diff --git a/src/V3Options.cpp b/src/V3Options.cpp
index 45c7cb60a..3f07d5fb5 100644
--- a/src/V3Options.cpp
+++ b/src/V3Options.cpp
@@ -989,7 +989,7 @@ void V3Options::parseOptsFile(FileLine* fl, const string& filename, bool rel) {
     // Read the specified -f filename and process as arguments
     UINFO(1,"Reading Options File "<<filename<<endl);
 
-    const auto_ptr<ifstream> ifp (V3File::new_ifstream(filename));
+    const VL_UNIQUE_PTR<ifstream> ifp (V3File::new_ifstream(filename));
     if (ifp->fail()) {
 	fl->v3error("Cannot open -f command file: "+filename);
 	return;
diff --git a/src/V3Order.cpp b/src/V3Order.cpp
index aa79062fe..16bc44359 100644
--- a/src/V3Order.cpp
+++ b/src/V3Order.cpp
@@ -1646,7 +1646,7 @@ void OrderVisitor::process() {
     m_graph.dumpDotFilePrefixed("orderg_done");
     if (0 && debug()) {
 	string dfilename = v3Global.opt.makeDir()+"/"+v3Global.opt.prefix()+"_INT_order.tree";
-	const auto_ptr<ofstream> logp (V3File::new_ofstream(dfilename));
+	const VL_UNIQUE_PTR<ofstream> logp (V3File::new_ofstream(dfilename));
 	if (logp->fail()) v3fatalSrc("Can't write "<<dfilename);
 	m_graph.dump(*logp);
     }
diff --git a/src/V3SymTable.h b/src/V3SymTable.h
index fa7c51e28..2812c2ee3 100644
--- a/src/V3SymTable.h
+++ b/src/V3SymTable.h
@@ -251,7 +251,7 @@ public:
 	if (v3Global.opt.dumpTree()) {
 	    string filename = v3Global.debugFilename(nameComment)+".txt";
 	    UINFO(2,"Dumping "<<filename<<endl);
-	    const auto_ptr<ofstream> logp (V3File::new_ofstream(filename));
+	    const VL_UNIQUE_PTR<ofstream> logp (V3File::new_ofstream(filename));
 	    if (logp->fail()) v3fatalSrc("Can't write "<<filename);
 	    dump(*logp, "");
 	}