From 9927e8b3ee211af594c2a8b961343d8c913a129b Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 15 Aug 2020 09:48:08 -0400 Subject: [PATCH] clang-format uses C++11 style. No functional change. --- .clang-format | 2 +- include/verilated.cpp | 2 +- include/verilated_cov.cpp | 2 +- include/verilated_unordered_set_map.h | 4 ++-- src/V3Class.cpp | 2 +- src/V3GraphStream.h | 2 +- src/V3HierBlock.cpp | 2 +- src/V3HierBlock.h | 2 +- src/V3LifePost.cpp | 2 +- src/V3LinkDot.cpp | 4 ++-- src/V3Options.cpp | 2 +- src/V3Param.cpp | 2 +- src/V3Scope.cpp | 2 +- src/V3Scoreboard.h | 4 ++-- src/V3SplitVar.cpp | 2 +- src/V3Task.cpp | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.clang-format b/.clang-format index 5e66ff611..edb50069b 100644 --- a/.clang-format +++ b/.clang-format @@ -104,7 +104,7 @@ SpacesInContainerLiterals: true SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false -Standard: Cpp03 +Standard: Cpp11 TabWidth: 8 UseTab: Never ... diff --git a/include/verilated.cpp b/include/verilated.cpp index f21bed470..326657e78 100644 --- a/include/verilated.cpp +++ b/include/verilated.cpp @@ -2310,7 +2310,7 @@ const char* Verilated::catName(const char* n1, const char* n2, const char* delim // Keeping these out of class Verilated to avoid having to include // in verilated.h (for compilation speed) -typedef std::list > VoidPCbList; +typedef std::list> VoidPCbList; static VoidPCbList g_flushCbs; static VoidPCbList g_exitCbs; diff --git a/include/verilated_cov.cpp b/include/verilated_cov.cpp index 65459998d..9cf756532 100644 --- a/include/verilated_cov.cpp +++ b/include/verilated_cov.cpp @@ -360,7 +360,7 @@ public: os << "# SystemC::Coverage-3\n"; // Build list of events; totalize if collapsing hierarchy - typedef std::map > EventMap; + typedef std::map> EventMap; EventMap eventCounts; for (ItemList::iterator it = m_items.begin(); it != m_items.end(); ++it) { VerilatedCovImpItem* itemp = *(it); diff --git a/include/verilated_unordered_set_map.h b/include/verilated_unordered_set_map.h index f66a2bec6..c8d9afcea 100644 --- a/include/verilated_unordered_set_map.h +++ b/include/verilated_unordered_set_map.h @@ -97,7 +97,7 @@ template struct vl_equal_to { //=================================================================== // /// Functional clone of the std::unordered_set hash table. -template , class T_Equal = vl_equal_to > +template , class T_Equal = vl_equal_to> class vl_unordered_set { public: // TYPES @@ -400,7 +400,7 @@ private: // /// Functional clone of the std::unordered_map hash table. template , - class T_Equal = vl_equal_to > + class T_Equal = vl_equal_to> class vl_unordered_map { private: // TYPES diff --git a/src/V3Class.cpp b/src/V3Class.cpp index b942c30c5..59d30c97b 100644 --- a/src/V3Class.cpp +++ b/src/V3Class.cpp @@ -35,7 +35,7 @@ private: AstUser1InUse m_inuser1; string m_prefix; // String prefix to add to name based on hier AstScope* m_classScopep; // Package moving scopes into - typedef std::vector > MoveVector; + typedef std::vector> MoveVector; MoveVector m_moves; // NODE STATE diff --git a/src/V3GraphStream.h b/src/V3GraphStream.h index 028d0a203..532282ad6 100644 --- a/src/V3GraphStream.h +++ b/src/V3GraphStream.h @@ -228,6 +228,6 @@ private: // GraphStreamUnordered is GraphStream using a plain pointer compare to // break ties in the graph order. This WILL return nodes in // nondeterministic order. -typedef GraphStream > GraphStreamUnordered; +typedef GraphStream> GraphStreamUnordered; #endif // Guard diff --git a/src/V3HierBlock.cpp b/src/V3HierBlock.cpp index 8f8d20f6d..da58c3d14 100644 --- a/src/V3HierBlock.cpp +++ b/src/V3HierBlock.cpp @@ -357,7 +357,7 @@ void V3HierBlockPlan::createPlan(AstNetlist* nodep) { } V3HierBlockPlan::HierVector V3HierBlockPlan::hierBlocksSorted() const { - typedef std::map > ChildrenMap; + typedef std::map> ChildrenMap; ChildrenMap childrenOfHierBlock; HierVector sorted; diff --git a/src/V3HierBlock.h b/src/V3HierBlock.h index 9891b1ba8..8bcfada43 100644 --- a/src/V3HierBlock.h +++ b/src/V3HierBlock.h @@ -46,7 +46,7 @@ public: private: // TYPES // Parameter name, stringified value - typedef std::vector > StrGParams; + typedef std::vector> StrGParams; // MEMBERS const AstNodeModule* m_modp; // Hierarchical block module diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index 80c72f749..e09993029 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -151,7 +151,7 @@ private: // Map each varscope to one or more locations where it's accessed. // These maps will not include any ASSIGNPOST accesses: - typedef vl_unordered_map > LocMap; + typedef vl_unordered_map> LocMap; LocMap m_reads; // VarScope read locations LocMap m_writes; // VarScope write locations diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index a0b41c61b..bbe80cb5c 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -140,9 +140,9 @@ private: // TYPES typedef std::multimap NameScopeSymMap; typedef std::map ScopeAliasMap; - typedef std::set > ImplicitNameSet; + typedef std::set> ImplicitNameSet; typedef std::vector IfaceVarSyms; - typedef std::vector > IfaceModSyms; + typedef std::vector> IfaceModSyms; static LinkDotState* s_errorThisp; // Last self, for error reporting only diff --git a/src/V3Options.cpp b/src/V3Options.cpp index 30865472b..0ca65e114 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -53,7 +53,7 @@ class V3OptionsImp { public: // TYPES - typedef std::map > DirMap; // Directory listing + typedef std::map> DirMap; // Directory listing // STATE std::list m_allArgs; // List of every argument encountered diff --git a/src/V3Param.cpp b/src/V3Param.cpp index 7b1a03416..4b4d773a0 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -215,7 +215,7 @@ private: // TYPES // Note may have duplicate entries - typedef std::deque > IfaceRefRefs; + typedef std::deque> IfaceRefRefs; // STATE typedef std::map CloneMap; diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index 755ed82e2..4dde0187f 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -48,7 +48,7 @@ private: typedef vl_unordered_map PackageScopeMap; // These cannot be unordered unless make a specialized hashing pair (gcc-8) typedef std::map, AstVarScope*> VarScopeMap; - typedef std::set > VarRefScopeSet; + typedef std::set> VarRefScopeSet; // STATE, inside processing a single module AstNodeModule* m_modp; // Current module diff --git a/src/V3Scoreboard.h b/src/V3Scoreboard.h index 3936d831b..19d0b8b41 100644 --- a/src/V3Scoreboard.h +++ b/src/V3Scoreboard.h @@ -40,7 +40,7 @@ /// value-sorted order. Values need not be unique. Uses T_KeyCompare to /// break ties in the sort when values collide. -template > +template > class SortByValueMap { // TYPES private: @@ -350,7 +350,7 @@ private: /// when the subset of elements whose scores change is much smaller than /// the full set size. -template > +template > class V3Scoreboard { private: // TYPES diff --git a/src/V3SplitVar.cpp b/src/V3SplitVar.cpp index 3cda051f0..d95eb54a0 100644 --- a/src/V3SplitVar.cpp +++ b/src/V3SplitVar.cpp @@ -922,7 +922,7 @@ public: std::vector splitPlan(bool skipUnused) const { UASSERT(m_dedupDone, "dedup() must be called before"); std::vector plan; - std::vector > points; // + std::vector> points; // points.reserve(m_lhs.size() * 2 + 2); // 2 points will be added per one PackedVarRefEntry for (const_iterator it = m_lhs.begin(), itend = m_lhs.end(); it != itend; ++it) { points.push_back(std::make_pair(it->lsb(), false)); // Start of a region diff --git a/src/V3Task.cpp b/src/V3Task.cpp index b9f8f2445..8b2fe6979 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -333,7 +333,7 @@ private: IM_AFTER, // Pointing at last inserted stmt, insert after IM_WHILE_PRECOND // Pointing to for loop, add to body end }; - typedef std::map > DpiNames; + typedef std::map> DpiNames; // STATE TaskStateVisitor* m_statep; // Common state between visitors