From 811bc691d2f8db219fa19f9b7b6cf9470eedb4bc Mon Sep 17 00:00:00 2001 From: Orvid King Date: Mon, 1 Aug 2016 17:55:10 -0700 Subject: [PATCH] Fixup the WDDX fix to compile against older HHVM. --- hphp/runtime/ext/wddx/ext_wddx.h | 1 + hphp/util/either.h | 1 + 2 files changed, 2 insertions(+) diff --git a/hphp/runtime/ext/wddx/ext_wddx.h b/hphp/runtime/ext/wddx/ext_wddx.h index 43f5f73c3030a1..f225217f7d9967 100644 --- a/hphp/runtime/ext/wddx/ext_wddx.h +++ b/hphp/runtime/ext/wddx/ext_wddx.h @@ -20,6 +20,7 @@ #include "hphp/runtime/ext/extension.h" #include "hphp/runtime/base/string-buffer.h" +#include "hphp/util/either.h" namespace HPHP { diff --git a/hphp/util/either.h b/hphp/util/either.h index 2a6e344d267240..0a74ef9410d30b 100644 --- a/hphp/util/either.h +++ b/hphp/util/either.h @@ -169,6 +169,7 @@ struct Either { * Returns whether this Either contains neither left nor right. */ bool isNull() const { return !(bits & ~TagBit); } + uintptr_t toOpaque() const { return bits; } private: static_assert(