Browse Source

Remove unneded, incompatible function inheritance (#3523)

C++17 removes these function templates. they aren't needed anyway
Greg Roth 4 years ago
parent
commit
bf112930d1
1 changed files with 2 additions and 2 deletions
  1. 2 2
      lib/DXIL/DxilShaderFlags.cpp

+ 2 - 2
lib/DXIL/DxilShaderFlags.cpp

@@ -283,14 +283,14 @@ struct ResourceKey {
   uint32_t UpperBound;
   uint32_t UpperBound;
 };
 };
 
 
-struct ResKeyEq : public std::binary_function<ResourceKey, ResourceKey, bool> {
+struct ResKeyEq {
    bool operator()(const ResourceKey& k1, const ResourceKey& k2) const {
    bool operator()(const ResourceKey& k1, const ResourceKey& k2) const {
      return k1.Class == k2.Class && k1.Space == k2.Space &&
      return k1.Class == k2.Class && k1.Space == k2.Space &&
        k1.LowerBound == k2.LowerBound && k1.UpperBound == k2.UpperBound;
        k1.LowerBound == k2.LowerBound && k1.UpperBound == k2.UpperBound;
    }
    }
 };
 };
 
 
-struct ResKeyHash : public std::unary_function<ResourceKey, std::size_t> {
+struct ResKeyHash {
    std::size_t operator()(const ResourceKey& k) const {
    std::size_t operator()(const ResourceKey& k) const {
      return std::hash<uint32_t>()(k.LowerBound) ^ (std::hash<uint32_t>()(k.UpperBound)<<1) ^
      return std::hash<uint32_t>()(k.LowerBound) ^ (std::hash<uint32_t>()(k.UpperBound)<<1) ^
        (std::hash<uint32_t>()(k.Space)<<2) ^ (std::hash<uint8_t>()(k.Class)<<3);
        (std::hash<uint32_t>()(k.Space)<<2) ^ (std::hash<uint8_t>()(k.Class)<<3);