starred/decaf-emu
1
0
Fork 0
mirror of https://github.com/decaf-emu/decaf-emu.git synced 2026-10-13 00:58:09 +00:00
Code Issues 9 Packages Projects Releases 1 Wiki Activity

cpu: Fixes for Pointer.

Browse Source
This commit is contained in:
James Benton
2018-04-25 17:12:06 +01:00
parent 4421fd76a9
commit 68452b2cb4
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libcpu/pointer.h
View File

@@ -139,9 +139,9 @@ public:
}
// Pointer<const Type> = const Pointer<Type> &
template<typename V = ValueType,
typename = std::enable_if<std::is_const<ValueType>::value>::type>
Pointer &operator =(const Pointer<typename std::remove_const<V>::type, AddressType> &other)
template<typename V = ValueType>
typename std::enable_if<std::is_const<V>::value, Pointer>::type &
operator =(const Pointer<typename std::remove_const<V>::type, AddressType> &other)
{
mAddress = other.mAddress;
return *this;
@@ -163,37 +163,43 @@ public:
}
template<typename K = ValueType>
typename std::enable_if<!std::is_void<K>::value, dereference_type &>::type operator *()
typename std::enable_if<!std::is_void<K>::value, dereference_type &>::type
operator *()
{
return *internal::translate<dereference_type>(mAddress);
}
template<typename K = ValueType>
typename std::enable_if<!std::is_void<K>::value, const dereference_type &>::type operator *() const
typename std::enable_if<!std::is_void<K>::value, const dereference_type &>::type
operator *() const
{
return *internal::translate<const dereference_type>(mAddress);
}
template<typename K = ValueType>
typename std::enable_if<!std::is_void<K>::value, dereference_type *>::type operator ->()
typename std::enable_if<!std::is_void<K>::value, dereference_type *>::type
operator ->()
{
return internal::translate<dereference_type>(mAddress);
}
template<typename K = ValueType>
typename std::enable_if<!std::is_void<K>::value, const dereference_type *>::type operator ->() const
typename std::enable_if<!std::is_void<K>::value, const dereference_type *>::type
operator ->() const
{
return internal::translate<const dereference_type>(mAddress);
}
template<typename K = ValueType>
typename std::enable_if<!std::is_void<K>::value, dereference_type &>::type operator [](size_t index)
typename std::enable_if<!std::is_void<K>::value, dereference_type &>::type
operator [](size_t index)
{
return internal::translate<dereference_type>(mAddress)[index];
}
template<typename K = ValueType>
typename std::enable_if<!std::is_void<K>::value, const dereference_type &>::type operator [](size_t index) const
typename std::enable_if<!std::is_void<K>::value, const dereference_type &>::type
operator [](size_t index) const
{
return internal::translate<const dereference_type>(mAddress)[index];
}
@@ -325,7 +331,7 @@ public:
}
protected:
template<typename AddressType, typename SrcType, typename DstType>
template<typename, typename, typename>
friend struct pointer_cast_impl;
template<typename AddressType2, typename ValueType2>