From 39f29e53a346eed9671a108b6aa59eb78b1dc084 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Sat, 8 Nov 2008 20:02:45 +0000
Subject: Move allocate.h with related code in alloc

---
 src/alloc/allocate.h  | 35 +++++++++++++++++++++++++++++++++++
 src/core/allocate.h   | 35 -----------------------------------
 src/core/info.txt     |  1 -
 src/libstate/info.txt |  1 +
 4 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 src/alloc/allocate.h
 delete mode 100644 src/core/allocate.h

(limited to 'src')

diff --git a/src/alloc/allocate.h b/src/alloc/allocate.h
new file mode 100644
index 000000000..efbb77291
--- /dev/null
+++ b/src/alloc/allocate.h
@@ -0,0 +1,35 @@
+/*************************************************
+* Allocator Header File                          *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_ALLOCATOR_H__
+#define BOTAN_ALLOCATOR_H__
+
+#include <botan/types.h>
+#include <string>
+
+namespace Botan {
+
+/*************************************************
+* Allocator Interface                            *
+*************************************************/
+class BOTAN_DLL Allocator
+   {
+   public:
+      static Allocator* get(bool);
+
+      virtual void* allocate(u32bit) = 0;
+      virtual void deallocate(void*, u32bit) = 0;
+
+      virtual std::string type() const = 0;
+
+      virtual void init() {}
+      virtual void destroy() {}
+
+      virtual ~Allocator() {}
+   };
+
+}
+
+#endif
diff --git a/src/core/allocate.h b/src/core/allocate.h
deleted file mode 100644
index efbb77291..000000000
--- a/src/core/allocate.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************
-* Allocator Header File                          *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
-
-#ifndef BOTAN_ALLOCATOR_H__
-#define BOTAN_ALLOCATOR_H__
-
-#include <botan/types.h>
-#include <string>
-
-namespace Botan {
-
-/*************************************************
-* Allocator Interface                            *
-*************************************************/
-class BOTAN_DLL Allocator
-   {
-   public:
-      static Allocator* get(bool);
-
-      virtual void* allocate(u32bit) = 0;
-      virtual void deallocate(void*, u32bit) = 0;
-
-      virtual std::string type() const = 0;
-
-      virtual void init() {}
-      virtual void destroy() {}
-
-      virtual ~Allocator() {}
-   };
-
-}
-
-#endif
diff --git a/src/core/info.txt b/src/core/info.txt
index 7fe58239f..21eb5e0d7 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -9,7 +9,6 @@ utils
 </requires>
 
 <add>
-allocate.h
 botan.h
 data_src.cpp
 buf_comp.h
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index a6d24b411..c5d20ad1f 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -5,6 +5,7 @@ load_on auto
 define LIBSTATE_MODULE
 
 <requires>
+system_alloc
 pk_pad
 s2k
 </requires>
-- 
cgit v1.2.3