lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[assert] Exclude static_assert macro when using C++

Browse Source 
Macro cannot be removed because it breaks lpclink2-lpcboot and others.

Fixes errors like:
In file included from third_party/lk/include/lib/page_alloc.h:32:0,
                 from app/fletch/loader.cpp:15:
third_party/lk/include/kernel/vm.h:70:96: error: macro "static_assert" passed 2 arguments, but takes just 1
 STATIC_ASSERT(__offsetof(struct mmu_initial_mapping, phys) == __MMU_INITIAL_MAPPING_PHYS_OFFSET);
                                                                                                ^
third_party/lk/include/kernel/vm.h:70:1: warning: identifier 'static_assert' is a keyword in C++11 [-Wc++0x-compat]

BUG=
R=travisg@google.com

Review URL: https://codereview.chromium.org/1496163002 .
This commit is contained in:
Carlos Pizano
2015-12-03 15:25:25 -08:00
parent cf67ac37c2
commit d31bd3d5ef
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/assert.h
View File

@@ -38,6 +38,9 @@
#endif
#define assert(e) DEBUG_ASSERT(e)
#ifndef __cplusplus
#define static_assert(e) STATIC_ASSERT(e)
#endif
#endif