Merge branch 'master' into master

1 files changed, 7 insertions, 8 deletions

diff --git a/src/util/basic_macros.h b/src/util/basic_macros.h
index 334e342e0..2d5cdb3b4 100644
--- a/src/util/basic_macros.h
+++ b/src/util/basic_macros.h
@@ -32,27 +32,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // 'Foobar', add the macro DISABLE_CLASS_COPY(Foobar) as a private member.
 // Note this also disables copying for any classes derived from 'Foobar' as well
 // as classes having a 'Foobar' member.
-#define DISABLE_CLASS_COPY(C)        \
-	C(const C &) = delete;           \
+#define DISABLE_CLASS_COPY(C)                                                            \
+	C(const C &) = delete;                                                           \
 	C &operator=(const C &) = delete;
 
 #ifndef _MSC_VER
-	#define UNUSED_ATTRIBUTE __attribute__ ((unused))
+#define UNUSED_ATTRIBUTE __attribute__((unused))
 #else
-	#define UNUSED_ATTRIBUTE
+#define UNUSED_ATTRIBUTE
 #endif
 
 // Fail compilation if condition expr is not met.
 // Note that 'msg' must follow the format of a valid identifier, e.g.
 // STATIC_ASSERT(sizeof(foobar_t) == 40), foobar_t_is_wrong_size);
-#define STATIC_ASSERT(expr, msg) \
-	UNUSED_ATTRIBUTE typedef char msg[!!(expr) * 2 - 1]
+#define STATIC_ASSERT(expr, msg) UNUSED_ATTRIBUTE typedef char msg[!!(expr)*2 - 1]
 
 // Macros to facilitate writing position vectors to a stream
 // Usage:
 //	v3s16 pos(1,2,3);
 //	mystream << "message " << PP(pos) << std::endl;
 
-#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
+#define PP(x) "(" << (x).X << "," << (x).Y << "," << (x).Z << ")"
 
-#define PP2(x) "("<<(x).X<<","<<(x).Y<<")"
+#define PP2(x) "(" << (x).X << "," << (x).Y << ")"