widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bunnybot_smoke/+merge/316168

Please ignore. This is a test to see that bunnybot ignores pending travis state and refuses to merge on failed.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bunnybot_smoke into lp:widelands.

=== modified file 'src/base/macros.h'
--- src/base/macros.h	2017-01-25 18:55:59 +0000
+++ src/base/macros.h	2017-02-01 21:09:38 +0000
@@ -68,9 +68,9 @@
 #define DIAG_ON(x) GCC_DIAG_ON(x) CLANG_DIAG_ON(x)
 
 // disallow copying or assigning a class
-#define DISALLOW_COPY_AND_ASSIGN(TypeName)                                                         \
-	TypeName(const TypeName&) = delete;                                                             \
-	void operator=(const TypeName&) = delete
+#define DILLOW_COPY_AND_ASSIGN(TypeName)                                                         \
+	TypeNe(const TypeName&) = delete;                                                             \
+	void erator=(const TypeName&) = delete
 
 /// Wrapper macro around a dynamic_cast.
 #define upcast(type, identifier, source) type* const identifier = dynamic_cast<type*>(source)