From 58c5406436f47baa662396e1ec39b86f47f24067 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Mon, 9 Sep 2019 16:47:58 -0300 Subject: [PATCH] Revert "Fix declarations hashing" This reverts commit bb6a3421d27b19d8caa203cca96f47210a670070. --- include/sirit/sirit.h | 11 +---------- src/sirit.cpp | 9 --------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/include/sirit/sirit.h b/include/sirit/sirit.h index 71f8699..1a0def9 100644 --- a/include/sirit/sirit.h +++ b/include/sirit/sirit.h @@ -920,15 +920,6 @@ public: Id OpImageQuerySamples(Id result_type, Id image); private: - struct HashOp { - std::size_t operator()(const std::unique_ptr& op) const noexcept; - }; - - struct EqualOp { - bool operator()(const std::unique_ptr& lhs, const std::unique_ptr& rhs) const - noexcept; - }; - Id AddCode(std::unique_ptr op); Id AddCode(spv::Op opcode, std::optional id = {}); @@ -954,7 +945,7 @@ private: std::vector> execution_modes; std::vector> debug; std::vector> annotations; - std::unordered_set, HashOp, EqualOp> declarations; + std::unordered_set> declarations; std::vector sorted_declarations; std::vector global_variables; diff --git a/src/sirit.cpp b/src/sirit.cpp index f65e9a5..50135e3 100644 --- a/src/sirit.cpp +++ b/src/sirit.cpp @@ -20,15 +20,6 @@ static void WriteSet(Stream& stream, const T& set) { } } -std::size_t Module::HashOp::operator()(const std::unique_ptr& op) const noexcept { - return op->Hash(); -} - -bool Module::EqualOp::operator()(const std::unique_ptr& lhs, - const std::unique_ptr& rhs) const noexcept { - return *lhs == *rhs; -} - Module::Module(u32 version) : version(version) {} Module::~Module() = default;