From f7d3d6511d38efd5c23cd7a78a7c24d56d2acec0 Mon Sep 17 00:00:00 2001 From: Jordan DeLong Date: Wed, 12 Jun 2013 18:46:22 -0700 Subject: [PATCH] Remove SmartAllocator support from Variant @override-unit-failures It looks like this is all it takes now. I couldn't find any of the old .inc file stuff; I guess it went away at some point. --- hphp/runtime/base/type_variant.cpp | 2 -- hphp/runtime/base/type_variant.h | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hphp/runtime/base/type_variant.cpp b/hphp/runtime/base/type_variant.cpp index 5b1c1bc71..ab55ddc93 100644 --- a/hphp/runtime/base/type_variant.cpp +++ b/hphp/runtime/base/type_variant.cpp @@ -49,8 +49,6 @@ static void unserializeProp(VariableUnserializer *uns, CStrRef context, CStrRef realKey, int nProp) NEVER_INLINE; -IMPLEMENT_SMART_ALLOCATION_HOT(Variant); - /////////////////////////////////////////////////////////////////////////////// // static strings diff --git a/hphp/runtime/base/type_variant.h b/hphp/runtime/base/type_variant.h index 68f7295a5..da4e31c5d 100644 --- a/hphp/runtime/base/type_variant.h +++ b/hphp/runtime/base/type_variant.h @@ -726,11 +726,10 @@ class Variant : private TypedValue { */ Variant share(bool save) const; - /** - * Memory allocator methods. + /* + * Print information about a variant to stdout. For debugging + * purposes. */ - DECLARE_SMART_ALLOCATION(Variant); - void dump() const; /**