From 61d58af7830875511d81ee6e84a188bf0c0d0bf4 Mon Sep 17 00:00:00 2001 From: Sean Cannella Date: Thu, 11 Jul 2013 17:21:17 -0700 Subject: [PATCH] fix compilation on Ubuntu 13.04 - missing inline generates warnings on Ubuntu which seems to make compiler very unhappy Closes #848 --- hphp/runtime/vm/bytecode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index 86df11a5e1990..46f6b268da244 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -3678,7 +3678,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopNot(PC& pc) { } template -void OPTBLD_INLINE VMExecutionContext::implCellBinOp(PC& pc, Op op) { +inline void OPTBLD_INLINE VMExecutionContext::implCellBinOp(PC& pc, Op op) { NEXT(); auto const c1 = m_stack.topC(); auto const c2 = m_stack.indC(1); @@ -3689,7 +3689,7 @@ void OPTBLD_INLINE VMExecutionContext::implCellBinOp(PC& pc, Op op) { } template -void OPTBLD_INLINE VMExecutionContext::implCellBinOpBool(PC& pc, Op op) { +inline void OPTBLD_INLINE VMExecutionContext::implCellBinOpBool(PC& pc, Op op) { NEXT(); auto const c1 = m_stack.topC(); auto const c2 = m_stack.indC(1);