<div dir="ltr"><div class="gmail_quote"><div dir="ltr">On Thu, Feb 18, 2016 at 2:07 PM Jordan Rose via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jrose<br>
Date: Thu Feb 18 16:03:23 2016<br>
New Revision: 261268<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=261268&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=261268&view=rev</a><br>
Log:<br>
[ADT] Be less clever when using a nonce type for disambiguation.<br>
<br>
Old compilers don't like constexpr, but we're only going to use this in one<br>
place anyway: this file. Everyone else should go through PointerLikeTypeTraits.<br>
<br>
Update to r261259.<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/ADT/PointerEmbeddedInt.h<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/PointerEmbeddedInt.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PointerEmbeddedInt.h?rev=261268&r1=261267&r2=261268&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PointerEmbeddedInt.h?rev=261268&r1=261267&r2=261268&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/PointerEmbeddedInt.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/PointerEmbeddedInt.h Thu Feb 18 16:03:23 2016<br>
@@ -45,7 +45,9 @@ class PointerEmbeddedInt {<br>
     Mask = static_cast<uintptr_t>(-1) << Bits<br>
   };<br>
<br>
-  static constexpr const struct RawValueTag {} RawValue = RawValueTag();<br>
+  struct RawValueTag {<br>
+    explicit RawValueTag() = default;<br>
+  };<br></blockquote><div><br></div><div>Why not just "struct RawValueTag {};"? Not sure what all the explicit stuff is buying you here...</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
   friend class PointerLikeTypeTraits<PointerEmbeddedInt>;<br>
<br>
@@ -86,10 +88,10 @@ public:<br>
     return reinterpret_cast<void *>(P.Value);<br>
   }<br>
   static inline T getFromVoidPointer(void *P) {<br>
-    return T(reinterpret_cast<uintptr_t>(P), T::RawValue);<br>
+    return T(reinterpret_cast<uintptr_t>(P), typename T::RawValueTag());<br>
   }<br>
   static inline T getFromVoidPointer(const void *P) {<br>
-    return T(reinterpret_cast<uintptr_t>(P), T::RawValue);<br>
+    return T(reinterpret_cast<uintptr_t>(P), typename T::RawValueTag());<br>
   }<br>
<br>
   enum { NumLowBitsAvailable = T::Shift };<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>