From ccf3374e494c31f52c9ae3b63480e3cc6fd2510d Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Sat, 21 Jun 2014 20:21:33 +0200
Subject: Removed ACE dependies from ByteBuffer

---
 src/server/shared/Packets/ByteBuffer.cpp | 8 ++------
 src/server/shared/Packets/ByteBuffer.h   | 5 ++---
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp
index b8cb5215665..450c9a4fa6c 100644
--- a/src/server/shared/Packets/ByteBuffer.cpp
+++ b/src/server/shared/Packets/ByteBuffer.cpp
@@ -20,18 +20,16 @@
 #include "Common.h"
 #include "Log.h"
 
-#include <ace/Stack_Trace.h>
 #include <sstream>
 
 ByteBufferPositionException::ByteBufferPositionException(bool add, size_t pos,
                                                          size_t size, size_t valueSize)
 {
     std::ostringstream ss;
-    ACE_Stack_Trace trace;
 
     ss << "Attempted to " << (add ? "put" : "get") << " value with size: "
        << valueSize << " in ByteBuffer (pos: " << pos << " size: " << size
-       << ")\n\n" << trace.c_str();
+       << ")\n\n";
 
     message().assign(ss.str());
 }
@@ -40,12 +38,10 @@ ByteBufferSourceException::ByteBufferSourceException(size_t pos, size_t size,
                                                      size_t valueSize)
 {
     std::ostringstream ss;
-    ACE_Stack_Trace trace;
 
     ss << "Attempted to put a "
        << (valueSize > 0 ? "NULL-pointer" : "zero-sized value")
-       << " in ByteBuffer (pos: " << pos << " size: " << size << ")\n\n"
-       << trace.c_str();
+       << " in ByteBuffer (pos: " << pos << " size: " << size << ")\n\n";
 
     message().assign(ss.str());
 }
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index bc46b87fa27..73b8f6b336f 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -22,8 +22,8 @@
 #include "Define.h"
 #include "Errors.h"
 #include "ByteConverter.h"
+#include "Util.h"
 
-#include <ace/OS_NS_time.h>
 #include <exception>
 #include <list>
 #include <map>
@@ -460,8 +460,7 @@ class ByteBuffer
 
         void AppendPackedTime(time_t time)
         {
-            tm lt;
-            ACE_OS::localtime_r(&time, &lt);
+            tm lt = localtime_r(time);
             append<uint32>((lt.tm_year - 100) << 24 | lt.tm_mon  << 20 | (lt.tm_mday - 1) << 14 | lt.tm_wday << 11 | lt.tm_hour << 6 | lt.tm_min);
         }
 
-- 
cgit v1.2.3