From: lpathy <lpathy@cavium.com>
Date: Wed, 3 Aug 2016 21:13:44 +0000 (-0700)
Subject: Added DiscriminatedPtr support to arm64
X-Git-Tag: v2016.08.08.00~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0376a8483140b2b53add54970021db04d0b5f149;p=folly.git

Added DiscriminatedPtr support to arm64

Summary: Closes https://github.com/facebook/folly/pull/429

Reviewed By: mzlee

Differential Revision: D3649806

Pulled By: Orvid

fbshipit-source-id: 77288e0a1aedf15a18f558e18fbc1dc3a56e5fd6
---

diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h
index 24494eff..43eb81e5 100644
--- a/folly/DiscriminatedPtr.h
+++ b/folly/DiscriminatedPtr.h
@@ -33,8 +33,8 @@
 #include <folly/Portability.h>
 #include <folly/detail/DiscriminatedPtrDetail.h>
 
-#if !FOLLY_X64 && !FOLLY_PPC64
-# error "DiscriminatedPtr is x64 and ppc64 specific code."
+#if !FOLLY_X64 && !FOLLY_A64 && !FOLLY_PPC64
+# error "DiscriminatedPtr is x64, arm64 and ppc64 specific code."
 #endif
 
 namespace folly {