Modernize client code (#6250)

[oweals/minetest.git] / src / objdef.h

diff --git a/src/objdef.h b/src/objdef.h
index 1dce367a9475f9c7c1ec01f88b4f70ac34e3a9f1..1b96fa52a473f8270ea73fff9969e2229ff5dca0 100644 (file)
--- a/src/objdef.h
+++ b/src/objdef.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef OBJDEF_HEADER
 #define OBJDEF_HEADER
 
-#include "basicmacros.h"
+#include "util/basic_macros.h"
 #include "porting.h"
 
 class IGameDef;
@@ -59,6 +59,7 @@ class ObjDefManager {
 public:
        ObjDefManager(IGameDef *gamedef, ObjDefType type);
        virtual ~ObjDefManager();
+       DISABLE_CLASS_COPY(ObjDefManager);
 
        virtual const char *getObjectTitle() const { return "ObjDef"; }
 
@@ -91,9 +92,6 @@ protected:
        INodeDefManager *m_ndef;
        std::vector<ObjDef *> m_objects;
        ObjDefType m_objtype;
-
-private:
-       DISABLE_CLASS_COPY(ObjDefManager);
 };
 
 #endif