Revert rbftest.cc to original version, Remove flag c++0x in makefile