From 32b8ee2e940cad78263723c8fd52062db2478dea Mon Sep 17 00:00:00 2001 From: Tyler Dauwalder Date: Sun, 27 Oct 2002 02:38:39 +0000 Subject: [PATCH] Renamed reserved functions to match those in R5, due to linking incompatibilities that appear to possibly be due to R5 versions of tests in libstoragetest_r5.so being compiled with our headers... At any rate, this appears to fix the BQuery linking problems. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1712 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/storage/Query.h | 12 ++++++------ src/kits/storage/Query.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/headers/os/storage/Query.h b/headers/os/storage/Query.h index 7094ba6fd5..bad607399d 100644 --- a/headers/os/storage/Query.h +++ b/headers/os/storage/Query.h @@ -104,12 +104,12 @@ private: status_t _EvaluateStack(); // FBC - virtual void _ReservedQuery1(); - virtual void _ReservedQuery2(); - virtual void _ReservedQuery3(); - virtual void _ReservedQuery4(); - virtual void _ReservedQuery5(); - virtual void _ReservedQuery6(); + virtual void _QwertyQuery1(); + virtual void _QwertyQuery2(); + virtual void _QwertyQuery3(); + virtual void _QwertyQuery4(); + virtual void _QwertyQuery5(); + virtual void _QwertyQuery6(); private: int32 _reservedData[4]; // FBC diff --git a/src/kits/storage/Query.cpp b/src/kits/storage/Query.cpp index 778c5ea3da..41667f1258 100644 --- a/src/kits/storage/Query.cpp +++ b/src/kits/storage/Query.cpp @@ -750,12 +750,12 @@ BQuery::_EvaluateStack() // FBC -void BQuery::_ReservedQuery1() {} -void BQuery::_ReservedQuery2() {} -void BQuery::_ReservedQuery3() {} -void BQuery::_ReservedQuery4() {} -void BQuery::_ReservedQuery5() {} -void BQuery::_ReservedQuery6() {} +void BQuery::_QwertyQuery1() {} +void BQuery::_QwertyQuery2() {} +void BQuery::_QwertyQuery3() {} +void BQuery::_QwertyQuery4() {} +void BQuery::_QwertyQuery5() {} +void BQuery::_QwertyQuery6() {}