- adjustments due to the new Eir SDK version
library/include/peloader.common.h (diff) library/include/peloader.h (diff)| @@ -162,13 +162,13 @@ | ||
| 162 | 162 | template <typename valueType> |
| 163 | 163 | using peVector = eir::Vector <valueType, PEGlobalStaticAllocator>; |
| 164 | 164 | |
| 165 | -template <typename charType> | |
| 165 | +template <eir::CharacterType charType> | |
| 166 | 166 | using peString = eir::String <charType, PEGlobalStaticAllocator>; |
| 167 | 167 | |
| 168 | -template <typename keyType, typename valueType, typename comparatorType = eir::MapDefaultComparator> | |
| 168 | +template <typename keyType, typename valueType, eir::CompareCompatibleComparator <keyType, keyType> comparatorType = eir::MapDefaultComparator> | |
| 169 | 169 | using peMap = eir::Map <keyType, valueType, PEGlobalStaticAllocator, comparatorType>; |
| 170 | 170 | |
| 171 | -template <typename valueType, typename comparatorType> | |
| 171 | +template <typename valueType, eir::CompareCompatibleComparator <valueType, valueType> comparatorType> | |
| 172 | 172 | using peSet = eir::Set <valueType, PEGlobalStaticAllocator, comparatorType>; |
| 173 | 173 | |
| 174 | 174 | #endif //_PELOADER_COMMON_HEADER_ |
| \ No newline at end of file |
| @@ -1462,31 +1462,35 @@ | ||
| 1462 | 1462 | peString <char> name; |
| 1463 | 1463 | mutable PESectionAllocation nameAllocEntry; |
| 1464 | 1464 | |
| 1465 | - friend inline bool operator < ( const peString <char>& left, const mappedName& right ) | |
| 1465 | + static inline eir::eCompResult compare_values( const peString <char>& left, const mappedName& right ) | |
| 1466 | 1466 | { |
| 1467 | 1467 | return FixedStringCompare( |
| 1468 | 1468 | left.GetConstString(), left.GetLength(), |
| 1469 | 1469 | right.name.GetConstString(), right.name.GetLength(), |
| 1470 | 1470 | true |
| 1471 | - ) == eir::eCompResult::LEFT_LESS; | |
| 1471 | + ); | |
| 1472 | 1472 | } |
| 1473 | 1473 | |
| 1474 | - friend inline bool operator < ( const mappedName& left, const peString <char>& right ) | |
| 1474 | + static inline eir::eCompResult compare_values( const mappedName& left, const peString <char>& right ) | |
| 1475 | 1475 | { |
| 1476 | 1476 | return FixedStringCompare( |
| 1477 | 1477 | left.name.GetConstString(), left.name.GetLength(), |
| 1478 | 1478 | right.GetConstString(), right.GetLength(), |
| 1479 | 1479 | true |
| 1480 | - ) == eir::eCompResult::LEFT_LESS; | |
| 1480 | + ); | |
| 1481 | 1481 | } |
| 1482 | 1482 | |
| 1483 | - inline bool operator < ( const mappedName& right ) const | |
| 1483 | + static inline eir::eCompResult compare_values( const mappedName& left, const mappedName& right ) | |
| 1484 | 1484 | { |
| 1485 | - return ( *this < right.name ); | |
| 1485 | + return FixedStringCompare( | |
| 1486 | + left.name.GetConstString(), left.name.GetLength(), | |
| 1487 | + right.name.GetConstString(), right.name.GetLength(), | |
| 1488 | + true | |
| 1489 | + ); | |
| 1486 | 1490 | } |
| 1487 | 1491 | }; |
| 1488 | 1492 | |
| 1489 | - peMap <mappedName, size_t> funcNameMap; | |
| 1493 | + peMap <mappedName, size_t, mappedName> funcNameMap; | |
| 1490 | 1494 | |
| 1491 | 1495 | // Helper API. |
| 1492 | 1496 | // (all ordinals have to be local to this image ordinal base) |
quiret