#trivial Fix the C++ assertion (#911)

* Fix the C++ assertion * Fix indentation
TextureGroup · May 7, 2018 · cb29317 · cb29317
1 parent d97065c
commit cb29317
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Base/ASBaseDefines.h b/Source/Base/ASBaseDefines.h
@@ -23,9 +23,6 @@
 // wrap constants, only C functions. See StackOverflow for more details:
 // http://stackoverflow.com/questions/1041866/in-c-source-what-is-the-effect-of-extern-c
 #ifdef __cplusplus
-# ifndef __STRICT_ANSI__
-  #warning "Texture must be compiled with std=c++11. gnu++ is not supported and may cause issues."
-# endif
 # define ASDISPLAYNODE_EXTERN_C_BEGIN extern "C" {
 # define ASDISPLAYNODE_EXTERN_C_END   }
 #else

diff --git a/Source/Details/Transactions/_ASAsyncTransaction.mm b/Source/Details/Transactions/_ASAsyncTransaction.mm
@@ -26,6 +26,10 @@
 #import <map>
 #import <mutex>
 
+#ifndef __STRICT_ANSI__
+  #warning "Texture must be compiled with std=c++11 to prevent layout issues. gnu++ is not supported. This is hopefully temporary."
+#endif
+
 #define ASAsyncTransactionAssertMainThread() NSAssert(0 != pthread_main_np(), @"This method must be called on the main thread");
 
 NSInteger const ASDefaultTransactionPriority = 0;