From 6411e0d21f38e2fe82e18da8b210c8ad68f9324a Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Sat, 26 Sep 2009 08:14:22 +0000
Subject: [PATCH] Removed duplicate kernel_cpp.h, now using the one in
 headers/private/kernel/util.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33300 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/drivers/network/usb_asix/Driver.h  |  2 +-
 .../drivers/network/usb_asix/kernel_cpp.h     | 45 -------------------
 .../kernel/drivers/network/usb_ecm/Driver.h   |  2 +-
 .../drivers/network/usb_ecm/kernel_cpp.h      | 45 -------------------
 4 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 src/add-ons/kernel/drivers/network/usb_asix/kernel_cpp.h
 delete mode 100644 src/add-ons/kernel/drivers/network/usb_ecm/kernel_cpp.h

diff --git a/src/add-ons/kernel/drivers/network/usb_asix/Driver.h b/src/add-ons/kernel/drivers/network/usb_asix/Driver.h
index 38186c4cdb..7c718d191f 100644
--- a/src/add-ons/kernel/drivers/network/usb_asix/Driver.h
+++ b/src/add-ons/kernel/drivers/network/usb_asix/Driver.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "kernel_cpp.h"
+#include <util/kernel_cpp.h>
 
 #define DRIVER_NAME	"usb_asix"
 #define MAX_DEVICES	8
diff --git a/src/add-ons/kernel/drivers/network/usb_asix/kernel_cpp.h b/src/add-ons/kernel/drivers/network/usb_asix/kernel_cpp.h
deleted file mode 100644
index 7d7b025872..0000000000
--- a/src/add-ons/kernel/drivers/network/usb_asix/kernel_cpp.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _KERNEL_CPP_H_
-#define _KERNEL_CPP_H_
-
-#include <malloc.h>
-
-inline void *
-operator new(size_t size)
-{
-	return malloc(size);
-}
-
-
-inline void *
-operator new[](size_t size)
-{
-	return malloc(size);
-}
-
-
-inline void
-operator delete(void *pointer)
-{
-	free(pointer);
-}
-
-
-inline void
-operator delete[](void *pointer)
-{
-	free(pointer);
-}
-
-
-inline void
-terminate(void)
-{
-}
-
-
-static inline void
-__throw()
-{
-}
-
-#endif // _KERNEL_CPP_H_
diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h b/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h
index f085950842..43e12f0b8c 100644
--- a/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h
+++ b/src/add-ons/kernel/drivers/network/usb_ecm/Driver.h
@@ -11,7 +11,7 @@
 #include <OS.h>
 #include <USB3.h>
 
-#include "kernel_cpp.h"
+#include <util/kernel_cpp.h>
 
 #define DRIVER_NAME	"usb_ecm"
 #define MAX_DEVICES	8
diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/kernel_cpp.h b/src/add-ons/kernel/drivers/network/usb_ecm/kernel_cpp.h
deleted file mode 100644
index 7d7b025872..0000000000
--- a/src/add-ons/kernel/drivers/network/usb_ecm/kernel_cpp.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _KERNEL_CPP_H_
-#define _KERNEL_CPP_H_
-
-#include <malloc.h>
-
-inline void *
-operator new(size_t size)
-{
-	return malloc(size);
-}
-
-
-inline void *
-operator new[](size_t size)
-{
-	return malloc(size);
-}
-
-
-inline void
-operator delete(void *pointer)
-{
-	free(pointer);
-}
-
-
-inline void
-operator delete[](void *pointer)
-{
-	free(pointer);
-}
-
-
-inline void
-terminate(void)
-{
-}
-
-
-static inline void
-__throw()
-{
-}
-
-#endif // _KERNEL_CPP_H_