From 54343bbc2d49684c7d85169ba9a4bab7fc53fac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 25 Jan 2004 14:48:40 +0000
Subject: [PATCH] Switched to kernel_cpp.h/cpp.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6291 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/file_systems/bfs/BlockAllocator.cpp       |  4 ++--
 src/add-ons/kernel/file_systems/bfs/BufferPool.cpp   |  3 +--
 src/add-ons/kernel/file_systems/bfs/Index.cpp        |  6 ++++--
 src/add-ons/kernel/file_systems/bfs/Jamfile          | 12 ++++++++++--
 src/add-ons/kernel/file_systems/bfs/Journal.cpp      |  3 ++-
 src/add-ons/kernel/file_systems/bfs/Query.cpp        |  2 +-
 src/add-ons/kernel/file_systems/bfs/Utility.cpp      |  3 ++-
 src/add-ons/kernel/file_systems/bfs/Volume.cpp       |  2 +-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
index 79a9ac5a85..4e8f17487b 100644
--- a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
@@ -5,7 +5,6 @@
 */
 
 
-#include "cpp.h"
 #include "Debug.h"
 #include "BlockAllocator.h"
 #include "Volume.h"
@@ -14,7 +13,8 @@
 #include "Stack.h"
 #include "bfs_control.h"
 
-#include <malloc.h>
+#include <kernel_cpp.h>
+#include <stdlib.h>
 
 #ifdef USER
 #	define spawn_kernel_thread spawn_thread
diff --git a/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp b/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp
index d8f2d98216..db6985ba42 100644
--- a/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp
@@ -7,9 +7,8 @@
 
 #include "BufferPool.h"
 #include "Debug.h"
-#include "cpp.h"
 
-#include <stdlib.h>
+#include <kernel_cpp.h>
 
 
 const uint32 kNumBuffers = 8;
diff --git a/src/add-ons/kernel/file_systems/bfs/Index.cpp b/src/add-ons/kernel/file_systems/bfs/Index.cpp
index 832e6be10a..828f091166 100644
--- a/src/add-ons/kernel/file_systems/bfs/Index.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Index.cpp
@@ -6,12 +6,12 @@
 
 
 #include "Debug.h"
-#include "cpp.h"
 #include "Index.h"
 #include "Volume.h"
 #include "Inode.h"
 #include "BPlusTree.h"
 
+#include <kernel_cpp.h>
 #include <TypeConstants.h>
 
 // B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
@@ -185,7 +185,9 @@ Index::Create(Transaction *transaction, const char *name, uint32 type)
 			mode = S_DOUBLE_INDEX;
 			break;
 		case B_STRING_TYPE:
-		case B_MIME_STRING_TYPE: // XXX Note Index::Type() will always return B_STRING_TYPE.  
+		case B_MIME_STRING_TYPE:
+			// B_MIME_STRING_TYPE is the only supported non-standard type, but
+			// will be handled like a B_STRING_TYPE internally
 			mode = S_STR_INDEX;
 			break;
 		default:
diff --git a/src/add-ons/kernel/file_systems/bfs/Jamfile b/src/add-ons/kernel/file_systems/bfs/Jamfile
index c4a8d7b0ab..d51189dafc 100644
--- a/src/add-ons/kernel/file_systems/bfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/bfs/Jamfile
@@ -24,10 +24,12 @@ oldOPTIM = $(OPTIM) ;
 	SubDirC++Flags $(defines) -Wall -Wno-multichar ;
 }
 
+UsePrivateHeaders [ FDirName kernel util ] ;			# For kernel_cpp.cpp
+
 R5KernelAddon obfs : [ FDirName kernel file_systems bfs ] :
 	BlockAllocator.cpp
 	BPlusTree.cpp
-	cpp.cpp
+	kernel_cpp.cpp
 	Debug.cpp
 	Index.cpp
 	Inode.cpp
@@ -37,7 +39,13 @@ R5KernelAddon obfs : [ FDirName kernel file_systems bfs ] :
 	Utility.cpp
 	Volume.cpp
 	BufferPool.cpp
-;
+	;
+
+SEARCH on [ FGristFiles
+		kernel_cpp.cpp 
+	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+
+#-----------------------------------------------------
 
 rule InstallBFS
 {
diff --git a/src/add-ons/kernel/file_systems/bfs/Journal.cpp b/src/add-ons/kernel/file_systems/bfs/Journal.cpp
index 56022a7df4..f0f7b881a8 100644
--- a/src/add-ons/kernel/file_systems/bfs/Journal.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Journal.cpp
@@ -5,11 +5,12 @@
 */
 
 
-#include "cpp.h"
 #include "Journal.h"
 #include "Inode.h"
 #include "Debug.h"
 
+#include <kernel_cpp.h>
+
 
 Journal::Journal(Volume *volume)
 	:
diff --git a/src/add-ons/kernel/file_systems/bfs/Query.cpp b/src/add-ons/kernel/file_systems/bfs/Query.cpp
index e968be147f..6b2d6c870e 100644
--- a/src/add-ons/kernel/file_systems/bfs/Query.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Query.cpp
@@ -10,7 +10,6 @@
 
 
 #include "Query.h"
-#include "cpp.h"
 #include "bfs.h"
 #include "Debug.h"
 #include "Stack.h"
@@ -19,6 +18,7 @@
 #include "BPlusTree.h"
 #include "Index.h"
 
+#include <kernel_cpp.h>
 #include <SupportDefs.h>
 #include <TypeConstants.h>
 #include <AppDefs.h>
diff --git a/src/add-ons/kernel/file_systems/bfs/Utility.cpp b/src/add-ons/kernel/file_systems/bfs/Utility.cpp
index adf16228fe..645da516e8 100644
--- a/src/add-ons/kernel/file_systems/bfs/Utility.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Utility.cpp
@@ -7,7 +7,8 @@
 
 #include "Utility.h"
 #include "Debug.h"
-#include "cpp.h"
+
+#include <kernel_cpp.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/add-ons/kernel/file_systems/bfs/Volume.cpp b/src/add-ons/kernel/file_systems/bfs/Volume.cpp
index 0ec7d7c66e..bfe9ec3a30 100644
--- a/src/add-ons/kernel/file_systems/bfs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Volume.cpp
@@ -6,12 +6,12 @@
 
 
 #include "Debug.h"
-#include "cpp.h"
 #include "Volume.h"
 #include "Journal.h"
 #include "Inode.h"
 #include "Query.h"
 
+#include <kernel_cpp.h>
 #include <KernelExport.h>
 #include <fs_volume.h>