• R/O
  • SSH
  • HTTPS

peframework: Commit


Commit MetaInfo

Revision38 (tree)
Zeit2021-08-30 07:26:57
Autorquiret

Log Message

- adjustments due to the new Eir SDK version

Ändern Zusammenfassung

Diff

--- library/include/peloader.common.h (revision 37)
+++ library/include/peloader.common.h (revision 38)
@@ -162,13 +162,13 @@
162162 template <typename valueType>
163163 using peVector = eir::Vector <valueType, PEGlobalStaticAllocator>;
164164
165-template <typename charType>
165+template <eir::CharacterType charType>
166166 using peString = eir::String <charType, PEGlobalStaticAllocator>;
167167
168-template <typename keyType, typename valueType, typename comparatorType = eir::MapDefaultComparator>
168+template <typename keyType, typename valueType, eir::CompareCompatibleComparator <keyType, keyType> comparatorType = eir::MapDefaultComparator>
169169 using peMap = eir::Map <keyType, valueType, PEGlobalStaticAllocator, comparatorType>;
170170
171-template <typename valueType, typename comparatorType>
171+template <typename valueType, eir::CompareCompatibleComparator <valueType, valueType> comparatorType>
172172 using peSet = eir::Set <valueType, PEGlobalStaticAllocator, comparatorType>;
173173
174174 #endif //_PELOADER_COMMON_HEADER_
\ No newline at end of file
--- library/include/peloader.h (revision 37)
+++ library/include/peloader.h (revision 38)
@@ -1462,31 +1462,35 @@
14621462 peString <char> name;
14631463 mutable PESectionAllocation nameAllocEntry;
14641464
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 )
14661466 {
14671467 return FixedStringCompare(
14681468 left.GetConstString(), left.GetLength(),
14691469 right.name.GetConstString(), right.name.GetLength(),
14701470 true
1471- ) == eir::eCompResult::LEFT_LESS;
1471+ );
14721472 }
14731473
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 )
14751475 {
14761476 return FixedStringCompare(
14771477 left.name.GetConstString(), left.name.GetLength(),
14781478 right.GetConstString(), right.GetLength(),
14791479 true
1480- ) == eir::eCompResult::LEFT_LESS;
1480+ );
14811481 }
14821482
1483- inline bool operator < ( const mappedName& right ) const
1483+ static inline eir::eCompResult compare_values( const mappedName& left, const mappedName& right )
14841484 {
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+ );
14861490 }
14871491 };
14881492
1489- peMap <mappedName, size_t> funcNameMap;
1493+ peMap <mappedName, size_t, mappedName> funcNameMap;
14901494
14911495 // Helper API.
14921496 // (all ordinals have to be local to this image ordinal base)
Show on old repository browser