Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#trivial Fix the C++ assertion #911

Merged
merged 2 commits into from
May 7, 2018
Merged

#trivial Fix the C++ assertion #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c73c9f8
Fix the C++ assertion
garrettmoon May 7, 2018
98463e8
Fix indentation
garrettmoon May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Source/Base/ASBaseDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Source/Details/Transactions/_ASAsyncTransaction.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down