Skip to content

Commit

Permalink
fix compilation on Ubuntu 13.04
Browse files Browse the repository at this point in the history 
- missing inline generates warnings on Ubuntu which seems to
make compiler very unhappy

Closes #848
  • Loading branch information
@scannell @sgolemon
scannell authored and sgolemon committed Jul 12, 2013
1 parent b010c70 commit 61d58af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hphp/runtime/vm/bytecode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3678,7 +3678,7 @@ inline void OPTBLD_INLINE VMExecutionContext::iopNot(PC& pc) {
}

template<class Op>
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);
Expand All @@ -3689,7 +3689,7 @@ void OPTBLD_INLINE VMExecutionContext::implCellBinOp(PC& pc, Op op) {
}

template<class Op>
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);
Expand Down

1 comment on commit 61d58af

@scannell
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turns out it was unrelated but this should eliminate the compiler warnings that were reported in this issue.

Please sign in to comment.