From 9f6b838f61e4dc384908cf745d90ab58ece19906 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Mon, 9 Dec 2024 17:34:23 -0800
Subject: [PATCH] Fix zip and permutation iterator EBO on MSVC (#3106)

* Fix zip and permutation iterator EBO on MSVC
---
 thrust/thrust/iterator/permutation_iterator.h | 3 ++-
 thrust/thrust/iterator/zip_iterator.h         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/thrust/thrust/iterator/permutation_iterator.h b/thrust/thrust/iterator/permutation_iterator.h
index 38dd35456b8..53ed3a21110 100644
--- a/thrust/thrust/iterator/permutation_iterator.h
+++ b/thrust/thrust/iterator/permutation_iterator.h
@@ -122,7 +122,8 @@ THRUST_NAMESPACE_BEGIN
  *  \see make_permutation_iterator
  */
 template <typename ElementIterator, typename IndexIterator>
-class permutation_iterator : public thrust::detail::permutation_iterator_base<ElementIterator, IndexIterator>::type
+class _LIBCUDACXX_DECLSPEC_EMPTY_BASES permutation_iterator
+    : public thrust::detail::permutation_iterator_base<ElementIterator, IndexIterator>::type
 {
   /*! \cond
    */
diff --git a/thrust/thrust/iterator/zip_iterator.h b/thrust/thrust/iterator/zip_iterator.h
index fe2203d842e..4ee987d04b5 100644
--- a/thrust/thrust/iterator/zip_iterator.h
+++ b/thrust/thrust/iterator/zip_iterator.h
@@ -131,7 +131,7 @@ THRUST_NAMESPACE_BEGIN
  *  \see get
  */
 template <typename IteratorTuple>
-class zip_iterator : public detail::zip_iterator_base<IteratorTuple>::type
+class _LIBCUDACXX_DECLSPEC_EMPTY_BASES zip_iterator : public detail::zip_iterator_base<IteratorTuple>::type
 {
 public:
   /*! The underlying iterator tuple type. Alias to zip_iterator's first template argument.