[haiku-commits] haiku: hrev47600 - headers/tools/cppunit

  • From: pulkomandy@xxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 29 Jul 2014 23:06:19 +0200 (CEST)

hrev47600 adds 1 changeset to branch 'master'
old head: dc5f63f635b2ac952c9284f5684d4b28af59096c
new head: 70f91e39aa2922cd4c31aad0582566d89e1d51ba
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=70f91e3+%5Edc5f63f

----------------------------------------------------------------------------

70f91e3: 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.

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev47600
Commit:      70f91e39aa2922cd4c31aad0582566d89e1d51ba
URL:         http://cgit.haiku-os.org/haiku/commit/?id=70f91e3
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Tue Jul 29 19:50:02 2014 UTC

----------------------------------------------------------------------------

1 file changed, 1 insertion(+), 5 deletions(-)
headers/tools/cppunit/TestShell.h | 6 +-----

----------------------------------------------------------------------------

diff --git a/headers/tools/cppunit/TestShell.h 
b/headers/tools/cppunit/TestShell.h
index b98993d..2704e13 100644
--- a/headers/tools/cppunit/TestShell.h
+++ b/headers/tools/cppunit/TestShell.h
@@ -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_


Other related posts: