From 6c82b6333fc9cc1f84890faf374788f79a0a5168 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Thu, 26 May 2016 16:02:44 +0200
Subject: [PATCH] AEsthetic modifications

---
 ZRColaCompile/dbsource.cpp | 5 +++--
 ZRColaCompile/main.cpp     | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp
index cc689d1..081db1c 100644
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -20,6 +20,7 @@
 #include "stdafx.h"
 
 using namespace std;
+using namespace stdex;
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -79,8 +80,8 @@ ZRCola::DBSource::character_bank::build_related_worker::~build_related_worker()
 
 unsigned int ZRCola::DBSource::character_bank::build_related_worker::process()
 {
-    stdex::heap_allocator<wchar_t> al(m_heap);
-    basic_string<wchar_t, char_traits<wchar_t>, stdex::heap_allocator<wchar_t> > rel(al);
+    heap_allocator<wchar_t> al(m_heap);
+    basic_string<wchar_t, char_traits<wchar_t>, heap_allocator<wchar_t> > rel(al);
 
     for (size_type i = m_from; i < m_to; i++) {
         ZRCola::DBSource::character &chr = *(m_cb->at(i).get());
diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index 7d67d53..d8ecd8e 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -20,6 +20,7 @@
 #include "stdafx.h"
 
 using namespace std;
+using namespace stdex;
 
 
 ///
@@ -102,7 +103,7 @@ int _tmain(int argc, _TCHAR *argv[])
     set<wstring> pot;
 
     // Open file ID.
-    streamoff dst_start = stdex::idrec::open<ZRCola::recordid_t, ZRCola::recordsize_t>(dst, ZRCOLA_DB_ID);
+    streamoff dst_start = idrec::open<ZRCola::recordid_t, ZRCola::recordsize_t>(dst, ZRCOLA_DB_ID);
 
     {
         // Get translations.
@@ -526,7 +527,7 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
-    stdex::idrec::close<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dst, dst_start);
+    idrec::close<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dst, dst_start);
 
     if (dst.fail()) {
         _ftprintf(stderr, wxT("%s: error ZCC1000: Writing to output file failed.\n"), (LPCTSTR)filenameOut.c_str());