summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKUDr <KUDr@openttd.org>2007-01-13 13:33:36 +0000
committerKUDr <KUDr@openttd.org>2007-01-13 13:33:36 +0000
commit574ded3afdab4c28b892101e550dc89ffd170e71 (patch)
treec12c9235da9fd1c9933108865ca991fa1f3092e4
parent152796b528783b693aa5a0b6429115f5d6ec8f33 (diff)
downloadopenttd-574ded3afdab4c28b892101e550dc89ffd170e71.tar.xz
(svn r8092) -Codechange: header files with miscellaneous template classes (smart pointers, blob, array, hashtable, etc.) moved from src/yapf to src/misc as they can now be used anywhere.
-rw-r--r--src/helpers.cpp2
-rw-r--r--src/misc/array.hpp (renamed from src/yapf/array.hpp)0
-rw-r--r--src/misc/autocopyptr.hpp (renamed from src/yapf/autocopyptr.hpp)0
-rw-r--r--src/misc/binaryheap.hpp (renamed from src/yapf/binaryheap.hpp)0
-rw-r--r--src/misc/blob.hpp (renamed from src/yapf/blob.hpp)0
-rw-r--r--src/misc/countedptr.hpp (renamed from src/yapf/countedptr.hpp)0
-rw-r--r--src/misc/crc32.hpp (renamed from src/yapf/crc32.hpp)0
-rw-r--r--src/misc/fixedsizearray.hpp (renamed from src/yapf/fixedsizearray.hpp)0
-rw-r--r--src/misc/hashtable.hpp (renamed from src/yapf/hashtable.hpp)0
-rw-r--r--src/yapf/nodelist.hpp6
-rw-r--r--src/yapf/yapf.hpp12
-rw-r--r--src/yapf/yapf_base.hpp4
12 files changed, 12 insertions, 12 deletions
diff --git a/src/helpers.cpp b/src/helpers.cpp
index d40078683..941906a60 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -5,7 +5,7 @@
#include "engine.h"
#include <new>
-#include "yapf/blob.hpp"
+#include "misc/blob.hpp"
/* Engine list manipulators - current implementation is only C wrapper around CBlobT<EngineID> (see yapf/blob.hpp) */
diff --git a/src/yapf/array.hpp b/src/misc/array.hpp
index e8eff1c8c..e8eff1c8c 100644
--- a/src/yapf/array.hpp
+++ b/src/misc/array.hpp
diff --git a/src/yapf/autocopyptr.hpp b/src/misc/autocopyptr.hpp
index fb6bfa028..fb6bfa028 100644
--- a/src/yapf/autocopyptr.hpp
+++ b/src/misc/autocopyptr.hpp
diff --git a/src/yapf/binaryheap.hpp b/src/misc/binaryheap.hpp
index 7b72a25af..7b72a25af 100644
--- a/src/yapf/binaryheap.hpp
+++ b/src/misc/binaryheap.hpp
diff --git a/src/yapf/blob.hpp b/src/misc/blob.hpp
index 1a20f3ac2..1a20f3ac2 100644
--- a/src/yapf/blob.hpp
+++ b/src/misc/blob.hpp
diff --git a/src/yapf/countedptr.hpp b/src/misc/countedptr.hpp
index e63e47fb5..e63e47fb5 100644
--- a/src/yapf/countedptr.hpp
+++ b/src/misc/countedptr.hpp
diff --git a/src/yapf/crc32.hpp b/src/misc/crc32.hpp
index 10e9a7ac4..10e9a7ac4 100644
--- a/src/yapf/crc32.hpp
+++ b/src/misc/crc32.hpp
diff --git a/src/yapf/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp
index 48b177f3c..48b177f3c 100644
--- a/src/yapf/fixedsizearray.hpp
+++ b/src/misc/fixedsizearray.hpp
diff --git a/src/yapf/hashtable.hpp b/src/misc/hashtable.hpp
index c6b52e50a..c6b52e50a 100644
--- a/src/yapf/hashtable.hpp
+++ b/src/misc/hashtable.hpp
diff --git a/src/yapf/nodelist.hpp b/src/yapf/nodelist.hpp
index f51afbfd4..a4d14e934 100644
--- a/src/yapf/nodelist.hpp
+++ b/src/yapf/nodelist.hpp
@@ -3,9 +3,9 @@
#ifndef NODELIST_HPP
#define NODELIST_HPP
-#include "array.hpp"
-#include "hashtable.hpp"
-#include "binaryheap.hpp"
+#include "../misc/array.hpp"
+#include "../misc/hashtable.hpp"
+#include "../misc/binaryheap.hpp"
/** Hash table based node list multi-container class.
* Implements open list, closed list and priority queue for A-star
diff --git a/src/yapf/yapf.hpp b/src/yapf/yapf.hpp
index 5aa63de1a..bd94dacc6 100644
--- a/src/yapf/yapf.hpp
+++ b/src/yapf/yapf.hpp
@@ -71,12 +71,12 @@ typedef CPerfStartFake CPerfStart;
//#undef FORCEINLINE
//#define FORCEINLINE inline
-#include "crc32.hpp"
-#include "blob.hpp"
-#include "fixedsizearray.hpp"
-#include "array.hpp"
-#include "hashtable.hpp"
-#include "binaryheap.hpp"
+#include "../misc/crc32.hpp"
+#include "../misc/blob.hpp"
+#include "../misc/fixedsizearray.hpp"
+#include "../misc/array.hpp"
+#include "../misc/hashtable.hpp"
+#include "../misc/binaryheap.hpp"
#include "nodelist.hpp"
#include "yapf_base.hpp"
#include "yapf_node.hpp"
diff --git a/src/yapf/yapf_base.hpp b/src/yapf/yapf_base.hpp
index e474cb155..e2a0a799e 100644
--- a/src/yapf/yapf_base.hpp
+++ b/src/yapf/yapf_base.hpp
@@ -5,8 +5,8 @@
#include "../debug.h"
-#include "fixedsizearray.hpp"
-#include "blob.hpp"
+#include "../misc/fixedsizearray.hpp"
+#include "../misc/blob.hpp"
#include "nodelist.hpp"
extern int _total_pf_time_us;