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

Fixed more visual studio warnings

This commit is contained in:
Clifford Wolf 2016-02-14 09:35:25 +01:00
parent bcc873b805
commit 0c4b311242
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/hashlib.h
View File

@ -95,9 +95,7 @@ template<typename P, typename Q> struct hash_ops<std::pair<P, Q>> {
return a == b; return a == b;
} }
static inline unsigned int hash(std::pair<P, Q> a) { static inline unsigned int hash(std::pair<P, Q> a) {
hash_ops<P> p_ops; return mkhash(hash_ops<P>::hash(a.first), hash_ops<Q>::hash(a.second));
hash_ops<Q> q_ops;
return mkhash(p_ops.hash(a.first), q_ops.hash(a.second));
} }
}; };
@ -111,8 +109,8 @@ template<typename... T> struct hash_ops<std::tuple<T...>> {
} }
template<size_t I = 0> template<size_t I = 0>
static inline typename std::enable_if<I != sizeof...(T), unsigned int>::type hash(std::tuple<T...> a) { static inline typename std::enable_if<I != sizeof...(T), unsigned int>::type hash(std::tuple<T...> a) {
hash_ops<typename std::tuple_element<I, std::tuple<T...>>::type> element_ops; typedef hash_ops<typename std::tuple_element<I, std::tuple<T...>>::type> element_ops_t;
return mkhash(hash<I+1>(a), element_ops.hash(std::get<I>(a))); return mkhash(hash<I+1>(a), element_ops_t::hash(std::get<I>(a)));
} }
}; };