Mesa (master): clover: use iterator_range in get_kernel_nodes

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Oct 9 21:54:22 UTC 2019


Module: Mesa
Branch: master
Commit: 6da865bcfeecaa9ab4bb1632416d813f7df24f3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6da865bcfeecaa9ab4bb1632416d813f7df24f3e

Author: Greg V <greg at unrelenting.technology>
Date:   Wed Jul  4 20:15:04 2018 +0300

clover: use iterator_range in get_kernel_nodes

With libc++ (LLVM's STL implementation), the original code does not compile because an
appropriate vector constructor cannot be found (for the _ForwardIterator one, requirement
is_constructible is not satisfied).

---

 src/gallium/state_trackers/clover/llvm/metadata.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/clover/llvm/metadata.hpp b/src/gallium/state_trackers/clover/llvm/metadata.hpp
index d23f317c0a5..b2f3e5d95b2 100644
--- a/src/gallium/state_trackers/clover/llvm/metadata.hpp
+++ b/src/gallium/state_trackers/clover/llvm/metadata.hpp
@@ -39,11 +39,11 @@
 namespace clover {
    namespace llvm {
       namespace detail {
-         inline std::vector<const ::llvm::MDNode *>
+         inline iterator_range< ::llvm::NamedMDNode::const_op_iterator>
          get_kernel_nodes(const ::llvm::Module &mod) {
             if (const ::llvm::NamedMDNode *n =
                    mod.getNamedMetadata("opencl.kernels"))
-               return { n->op_begin(), n->op_end() };
+               return range(n->op_begin(), n->op_end());
             else
                return {};
          }




More information about the mesa-commit mailing list