Commit b8f531e8 authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

Bug 1828784 - Work around VS 2019+ SDK issue. r=glandium 

This is enough to prevent the undesired instantiation.

Differential Revision: https://phabricator.services.mozilla.com/D175920
parent a73c63f7

js/public/GCVector.h

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ class GCVector { 
 public:

  using ElementType = T;



  explicit GCVector(AllocPolicy alloc = AllocPolicy())

      : vector(std::move(alloc)) {}

  explicit GCVector(AllocPolicy alloc) : vector(std::move(alloc)) {}

  GCVector() : GCVector(AllocPolicy()) {}



  GCVector(GCVector&& vec) : vector(std::move(vec.vector)) {}

mfbt/Vector.h

+4 −3
Original line number Diff line number Diff line
@@ -341,9 +341,8 @@ template <typename T, size_t MinInlineCapacity = 0, 
          class AllocPolicy = MallocAllocPolicy>

class MOZ_NON_PARAM Vector final : private AllocPolicy {

  /* utilities */



  static constexpr bool kElemIsPod =

      std::is_trivial<T>::value && std::is_standard_layout<T>::value;

      std::is_trivial_v<T> && std::is_standard_layout_v<T>;

  typedef detail::VectorImpl<T, MinInlineCapacity, AllocPolicy, kElemIsPod>

      Impl;

  friend struct detail::VectorImpl<T, MinInlineCapacity, AllocPolicy,
@@ -540,7 +539,9 @@ class MOZ_NON_PARAM Vector final : private AllocPolicy { 


  typedef T ElementType;



  explicit Vector(AllocPolicy = AllocPolicy());

  explicit Vector(AllocPolicy);

  Vector() : Vector(AllocPolicy()) {}



  Vector(Vector&&);            /* Move constructor. */

  Vector& operator=(Vector&&); /* Move assignment. */

  ~Vector();