cleanup naming conventions and header defs

1 files changed, 15 insertions, 20 deletions

diff --git a/src/memory.hpp b/src/memory.hpp
index 74e72a3..329be51 100644
--- a/src/memory.hpp
+++ b/src/memory.hpp
@@ -11,39 +11,34 @@
 
 #define DEFAULT_BUCKET_SIZE 1UL << 27
 
-namespace pke
-{
-
 struct MemBucket;
 
-void *PkeNew(std::size_t sz);
-void *PkeNew(std::size_t sz, MemBucket *bkt);
-void PkeDelete(const void *ptr, std::size_t sz);
-void PkeDelete(const void *ptr, std::size_t sz, MemBucket *bkt);
+void *Pke_New(std::size_t sz);
+void *Pke_New(std::size_t sz, MemBucket *bkt);
+void Pke_Delete(const void *ptr, std::size_t sz);
+void Pke_Delete(const void *ptr, std::size_t sz, MemBucket *bkt);
 
-MemBucket *BeginTransientBucket(int64_t sz = DEFAULT_BUCKET_SIZE); // 256MB
-void EndTransientBucket(MemBucket *bkt);
-void Flush();
+MemBucket *Pke_BeginTransientBucket(int64_t sz = DEFAULT_BUCKET_SIZE); // 256MB
+void Pke_EndTransientBucket(MemBucket *bkt);
+void Pke_MemoryFlush();
 
 template <typename T>
-inline T *PkeNew() {
-	return reinterpret_cast<T *>(PkeNew(sizeof(T)));
+inline T *Pke_New() {
+	return reinterpret_cast<T *>(Pke_New(sizeof(T)));
 }
 template <typename T>
-inline T *PkeNew(long count) {
-	return reinterpret_cast<T *>(PkeNew(sizeof(T) * count));
+inline T *Pke_New(long count) {
+	return reinterpret_cast<T *>(Pke_New(sizeof(T) * count));
 }
 template <typename T>
-inline void PkeDelete(const void *ptr) {
-	return PkeDelete(ptr, sizeof(T));
+inline void Pke_Delete(const void *ptr) {
+	return Pke_Delete(ptr, sizeof(T));
 }
 template <typename T>
-inline void PkeDelete(const void *ptr, long count) {
-	return PkeDelete(ptr, sizeof(T) * count);
+inline void Pke_Delete(const void *ptr, long count) {
+	return Pke_Delete(ptr, sizeof(T) * count);
 }
 
-} /* pke */ 
-
 uint64_t Buckets_NewHandle(std::size_t bucketBytes, uint64_t bucketItemCount, uint64_t &bucketIncrementer, uint64_t &bucketCounter, uint64_t &itemCounter, void*& buckets);
 
 template <typename T> inline uint64_t Buckets_NewHandle(uint64_t bucketItemCount, uint64_t &bucketIncrementer, uint64_t &bucketCounter, uint64_t &itemCounter, T*& buckets) {