Qualify ref() as phoenix::ref() to avoid ambiguity with new C++11 ref()
Add missing <iostream> includes
fix BinnedDataTest constructor call
update BinnedDataTest constructor call
Add method for obtaining bin neighbors
Add method for obtaining bin neighbors
Qualify ref() as phoenix::ref() to avoid ambiguity with new C++11 ref()
add ostream include
Fix clang warnings found with OS-X Mavericks
Fix merge conflicts
Forgot a merge conflict
Updates to work with the new clang compiler included with OS-X Mavericks.
Merge remote-tracking branch 'upstream/master'