riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2563 from whitequark/cxxrtl-msvc 

cxxrtl: do not use `->template` for non-dependent names
This commit is contained in:
whitequark 2021-01-26 21:55:12 +00:00 committed by GitHub
parent d73ffa07f2 4b6e764c46
commit a77fa6709b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backends/cxxrtl/cxxrtl.h
View File

@ -1217,49 +1217,49 @@ value<BitsY> xnor_ss(const value<BitsA> &a, const value<BitsB> &b) {
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> shl_uu(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> shl_uu(const value<BitsA> &a, const value<BitsB> &b) {
return a.template zcast<BitsY>().template shl(b); return a.template zcast<BitsY>().shl(b);
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> shl_su(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> shl_su(const value<BitsA> &a, const value<BitsB> &b) {
return a.template scast<BitsY>().template shl(b); return a.template scast<BitsY>().shl(b);
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> sshl_uu(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> sshl_uu(const value<BitsA> &a, const value<BitsB> &b) {
return a.template zcast<BitsY>().template shl(b); return a.template zcast<BitsY>().shl(b);
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> sshl_su(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> sshl_su(const value<BitsA> &a, const value<BitsB> &b) {
return a.template scast<BitsY>().template shl(b); return a.template scast<BitsY>().shl(b);
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> shr_uu(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> shr_uu(const value<BitsA> &a, const value<BitsB> &b) {
return a.template shr(b).template zcast<BitsY>(); return a.shr(b).template zcast<BitsY>();
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> shr_su(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> shr_su(const value<BitsA> &a, const value<BitsB> &b) {
return a.template shr(b).template scast<BitsY>(); return a.shr(b).template scast<BitsY>();
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> sshr_uu(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> sshr_uu(const value<BitsA> &a, const value<BitsB> &b) {
return a.template shr(b).template zcast<BitsY>(); return a.shr(b).template zcast<BitsY>();
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>
CXXRTL_ALWAYS_INLINE CXXRTL_ALWAYS_INLINE
value<BitsY> sshr_su(const value<BitsA> &a, const value<BitsB> &b) { value<BitsY> sshr_su(const value<BitsA> &a, const value<BitsB> &b) {
return a.template sshr(b).template scast<BitsY>(); return a.sshr(b).template scast<BitsY>();
} }
template<size_t BitsY, size_t BitsA, size_t BitsB> template<size_t BitsY, size_t BitsA, size_t BitsB>

4
backends/cxxrtl/cxxrtl_vcd.h
View File

@ -228,13 +228,13 @@ public:
} }
void add(const debug_items &items) { void add(const debug_items &items) {
this->template add(items, [](const std::string &, const debug_item &) { this->add(items, [](const std::string &, const debug_item &) {
return true; return true;
}); });
} }
void add_without_memories(const debug_items &items) { void add_without_memories(const debug_items &items) {
this->template add(items, [](const std::string &, const debug_item &item) { this->add(items, [](const std::string &, const debug_item &item) {
return item.type != debug_item::MEMORY; return item.type != debug_item::MEMORY;
}); });
} }