From c195a07982f3b41f5a9b208e5d57e8af9bba1579 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 26 May 2016 16:27:55 +0200
Subject: [PATCH] Code simplified as the benefit did not outweigh complexity

---
 ZRColaCompile/dbsource.cpp | 11 +----------
 ZRColaCompile/dbsource.h   |  2 --
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp
index 081db1c..3fc473c 100644
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -61,7 +61,6 @@ void ZRCola::DBSource::character_bank::build_related()
 
 ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ character_bank *cb, _In_ size_type from, _In_ size_type to) :
     thread_type((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
-    m_heap(HeapCreate(0, 0, 0)),
     m_cb(cb),
     m_from(from),
     m_to(to)
@@ -71,17 +70,9 @@ ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In
 }
 
 
-ZRCola::DBSource::character_bank::build_related_worker::~build_related_worker()
-{
-    assert(m_heap);
-    HeapDestroy(m_heap);
-}
-
-
 unsigned int ZRCola::DBSource::character_bank::build_related_worker::process()
 {
-    heap_allocator<wchar_t> al(m_heap);
-    basic_string<wchar_t, char_traits<wchar_t>, heap_allocator<wchar_t> > rel(al);
+    wstring rel;
 
     for (size_type i = m_from; i < m_to; i++) {
         ZRCola::DBSource::character &chr = *(m_cb->at(i).get());
diff --git a/ZRColaCompile/dbsource.h b/ZRColaCompile/dbsource.h
index d063747..1eb658e 100644
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -177,7 +177,6 @@ namespace ZRCola {
 
             public:
                 build_related_worker(_In_ character_bank *cb, _In_ size_type from, _In_ size_type to);
-                virtual ~build_related_worker();
 
                 inline void join()
                 {
@@ -200,7 +199,6 @@ namespace ZRCola {
             protected:
                 character_bank *m_cb;
                 size_type m_from, m_to;
-                HANDLE m_heap;
             };
         };