Leave the code as is for now. Just replace membuffer by its C++ version. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>