(se)SerializeString: Include max length in the name

[minetest.git] / src / util / pointer.h

diff --git a/src/util/pointer.h b/src/util/pointer.h
index f68269882f22ccd1ce36fbb298292f0c5aaf5044..d29ec87399b0ada78530401e61c2b55dfeb1a124 100644 (file)
--- a/src/util/pointer.h
+++ b/src/util/pointer.h
@@ -17,11 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef UTIL_POINTER_HEADER
-#define UTIL_POINTER_HEADER
+#pragma once
 
-#include "../irrlichttypes.h"
-#include "../debug.h" // For assert()
+#include "irrlichttypes.h"
+#include "debug.h" // For assert()
 #include <cstring>
 
 template <typename T>
@@ -105,7 +104,6 @@ class Buffer
 
 /************************************************
  *           !!!  W A R N I N G  !!!            *
- *           !!!  A C H T U N G  !!!            *
  *                                              *
  * This smart pointer class is NOT thread safe. *
  * ONLY use in a single-threaded context!       *
@@ -135,7 +133,6 @@ class SharedBuffer
        }
        SharedBuffer(const SharedBuffer &buffer)
        {
-               //std::cout<<"SharedBuffer(const SharedBuffer &buffer)"<<std::endl;
                m_size = buffer.m_size;
                data = buffer.data;
                refcount = buffer.refcount;
@@ -143,7 +140,6 @@ class SharedBuffer
        }
        SharedBuffer & operator=(const SharedBuffer & buffer)
        {
-               //std::cout<<"SharedBuffer & operator=(const SharedBuffer & buffer)"<<std::endl;
                if(this == &buffer)
                        return *this;
                drop();
@@ -175,10 +171,9 @@ class SharedBuffer
        SharedBuffer(const Buffer<T> &buffer)
        {
                m_size = buffer.getSize();
-               if(m_size != 0)
-               {
-                       data = new T[m_size];
-                       memcpy(data, *buffer, buffer.getSize());
+               if (m_size != 0) {
+                               data = new T[m_size];
+                               memcpy(data, *buffer, buffer.getSize());
                }
                else
                        data = NULL;
@@ -221,12 +216,3 @@ class SharedBuffer
        unsigned int m_size;
        unsigned int *refcount;
 };
-
-inline SharedBuffer<u8> SharedBufferFromString(const char *string)
-{
-       SharedBuffer<u8> b((u8*)string, strlen(string)+1);
-       return b;
-}
-
-#endif
-