Remove preprocessor checks from TestShell.h

* This is a header used by several parts of the code which should not
need to know about ELF symbol overriding and the fact that it is
optional.
* When the define is set, the methods will not be defined, but they
shouldn't be called, either
* This makes sure the memory layout of the class stays the same with the
define set or unset, and users can rely on it.

Fixes UnitTester on gcc2.
This commit is contained in:
Adrien Destugues 2014-07-29 21:50:02 +02:00
parent dc5f63f635
commit 70f91e39aa

View File

@ -119,13 +119,12 @@ protected:
bool fListTestsAndExit;
BPath *fTestDir;
int32 fTLSDebuggerCall;
#ifndef NO_ELF_SYMBOL_PATCHING
BLocker *fPatchGroupLocker;
ElfSymbolPatchGroup *fPatchGroup;
void (*fOldDebuggerHook)(const char*);
image_id (*fOldLoadAddOnHook)(const char*);
status_t (*fOldUnloadAddOnHook)(image_id);
#endif // ! NO_ELF_SYMBOL_PATCHING
//! Prints a brief description of the program.
virtual void PrintDescription(int argc, char *argv[]);
@ -176,7 +175,6 @@ private:
//! Prevents the use of the copy operator.
void operator =( const BTestShell &copy );
#ifndef NO_ELF_SYMBOL_PATCHING
void _Debugger(const char* message);
image_id _LoadAddOn(const char* path);
status_t _UnloadAddOn(image_id image);
@ -184,8 +182,6 @@ private:
static void _DebuggerHook(const char* message);
static image_id _LoadAddOnHook(const char* path);
static status_t _UnloadAddOnHook(image_id image);
#endif // ! NO_ELF_SYMBOL_PATCHING
}; // class BTestShell
#endif // _beos_test_shell_h_