[haiku-commits] haiku: hrev48159 - src/tests/add-ons/kernel/file_systems/bfs/btree
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 30 Oct 2014 00:43:16 +0100 (CET)
hrev48159 adds 2 changesets to branch 'master'
old head: b9c8e3de1b3f0c9b87b8bbb6bf9d26351e17c8c8
new head: 00460996cff3ef294bf879ad2a16306ed2f98a86
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=0046099+%5Eb9c8e3d
----------------------------------------------------------------------------
64bb360: btreeTest: Remove equal sign from preinclude argument.
No separator at all (no space and no equal sign) seems to be the only
version that is accepted by both GCC versions.
0046099: btreeTest: Change include for debug helpers.
Including BPlusTree.h pulls in the common versions of the debug macros
(via the Debug.h from BFS) and therefore avoids redefinition warnings.
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 2 deletions(-)
src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile | 2 +-
src/tests/add-ons/kernel/file_systems/bfs/btree/cache.cpp | 4 +++-
############################################################################
Commit: 64bb360b8c2e723275933d6e87ce48eb35d5ae1d
URL: http://cgit.haiku-os.org/haiku/commit/?id=64bb360
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Wed Oct 29 23:38:28 2014 UTC
btreeTest: Remove equal sign from preinclude argument.
No separator at all (no space and no equal sign) seems to be the only
version that is accepted by both GCC versions.
----------------------------------------------------------------------------
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
b/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
index 790bc6b..18771f1 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/bfs/btree/Jamfile
@@ -5,7 +5,7 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
UsePrivateKernelHeaders ;
UsePrivateHeaders shared ;
-rule FPreIncludes { return -include=$(1:D=$(SUBDIR)) ; }
+rule FPreIncludes { return -include$(1:D=$(SUBDIR)) ; }
{
local defines = [ FDefines USER DEBUG ] ; # _NO_INLINE_ASM
############################################################################
Revision: hrev48159
Commit: 00460996cff3ef294bf879ad2a16306ed2f98a86
URL: http://cgit.haiku-os.org/haiku/commit/?id=0046099
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Wed Oct 29 23:40:18 2014 UTC
btreeTest: Change include for debug helpers.
Including BPlusTree.h pulls in the common versions of the debug macros
(via the Debug.h from BFS) and therefore avoids redefinition warnings.
----------------------------------------------------------------------------
diff --git a/src/tests/add-ons/kernel/file_systems/bfs/btree/cache.cpp
b/src/tests/add-ons/kernel/file_systems/bfs/btree/cache.cpp
index feafc01..8e0d67c 100644
--- a/src/tests/add-ons/kernel/file_systems/bfs/btree/cache.cpp
+++ b/src/tests/add-ons/kernel/file_systems/bfs/btree/cache.cpp
@@ -7,7 +7,9 @@
#include "cache.h"
-#include <Debug.h>
+#include "BPlusTree.h"
+ // To get at the right debug helpers
+
#include <File.h>
#include <List.h>
Other related posts:
