Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-21 16:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Global: rename HAVE_NULLPTR_T with HAVE_STD_NULLPTR_T

Browse Source 
This makes for a more standard name for these overrides.
This commit is contained in:
Lucas De Marchi 2016-02-16 12:27:52 -02:00
parent 815d653283
commit 75d58bcfb6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Common/missing/cstddef
View File

@ -2,7 +2,7 @@
#include_next <cstddef>
#if defined(HAVE_NULLPTR_T) && !HAVE_NULLPTR_T
#if defined(HAVE_STD_NULLPTR_T) && !HAVE_STD_NULLPTR_T
namespace std {
typedef decltype(nullptr) nullptr_t;

2
mk/board_qflight.mk
View File

@ -37,7 +37,7 @@ GENERATE_TARGETS = $(GENERATE_DSP_C) $(GENERATE_ARM_C) $(QFLIGHT_BUILD)/qflight_
LIBOBJS += $(QFLIGHT_BUILD)/qflight_stub.o
# Add missing parts from libc and libstdc++
MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0 -DHAVE_STD_MOVE=0
MISSING_TOOLCHAIN_FLAGS += -DHAVE_STD_NULLPTR_T=0 -DHAVE_STD_MOVE=0
MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
# DSP build flags

2
mk/board_qurt.mk
View File

@ -49,7 +49,7 @@ DSP_FLAGS=-mv5 -G0 -g $(OPT) $(DSP_WARN) -fno-exceptions -fno-strict-aliasing -f
DSP_LINK_FLAGS = -mv5 -G0 -fpic -shared -Wl,-Bsymbolic -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=realloc -Wl,--wrap=memalign -Wl,--wrap=__stack_chk_fail -Wl,-soname=lib$(SKETCHNAME)_skel.so
# Add missing parts from libc and libstdc++
MISSING_TOOLCHAIN_FLAGS += -DHAVE_NULLPTR_T=0 -DHAVE_STD_MOVE=0
MISSING_TOOLCHAIN_FLAGS += -DHAVE_STD_NULLPTR_T=0 -DHAVE_STD_MOVE=0
MISSING_TOOLCHAIN_FLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
CXXFLAGS += -std=gnu++11 $(WARNFLAGS) $(WARNFLAGSCXX) $(DEPFLAGS) $(MISSING_TOOLCHAIN_FLAGS) $(CXXOPTS) $(DEFINES) $(DSP_FLAGS)

2
mk/px4_targets.mk
View File

@ -41,7 +41,7 @@ EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\""
EXTRAFLAGS += -DUAVCAN=1
# Add missing parts from libc and libstdc++
EXTRAFLAGS += -DHAVE_NULLPTR_T=0
EXTRAFLAGS += -DHAVE_STD_NULLPTR_T=0
EXTRAFLAGS += -I$(SKETCHBOOK)/libraries/AP_Common/missing
# we have different config files for V1 and V2