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.

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

NRF5x: Fix `error_t` conflict with gcc std>=gnu++11 #6115

Merged
merged 1 commit into from Feb 19, 2018

Conversation

Projects
None yet
5 participants
@andrewleech
Contributor

andrewleech commented Feb 16, 2018

Description

The Nordic implementation of FEATURE_BLE includes a typedef error_h which conflicts with a gcc standard implementation of error_h when compiled by GCC with newer standards enabled -std=gnu++11 or above.

The conflict is traced to nRF5XPalGattClient.cpp importing <memory.h>
This file does not actually need anything from this include however, it only requires <new.h> (for some compilers).

See #5979 for original fix and detailed discussion

Status

READY

Migrations

There should be no changes to end user code.

Related PRs

#5979

Avoid importing <memory> as this causes a typedef conflict on `error_…
…t` whien compiling with gcc "-std=gnu++11" or above
@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 16, 2018

--none--

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Feb 16, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 16, 2018

Build : SUCCESS

Build number : 1154
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6115/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@pan-

Thanks for the fix; LGTM.

@pan-

pan- approved these changes Feb 19, 2018

@0xc0170 0xc0170 merged commit 3fec23e into ARMmbed:master Feb 19, 2018

17 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
mbed-ci-generic Build finished.
Details
travis-ci/docs/ Local docs testing has passed
Details
travis-ci/events/ Local events testing has passed
Details
travis-ci/littlefs/ Local littlefs testing has passed
Details
travis-ci/mbed2-ATMEL/ Local mbed2-ATMEL testing has passed
Details
travis-ci/mbed2-MAXIM/ Local mbed2-MAXIM testing has passed
Details
travis-ci/mbed2-NORDIC/ Local mbed2-NORDIC testing has passed
Details
travis-ci/mbed2-NUVOTON/ Local mbed2-NUVOTON testing has passed
Details
travis-ci/mbed2-NXP/ Local mbed2-NXP testing has passed
Details
travis-ci/mbed2-SILICON_LABS/ Local mbed2-SILICON_LABS testing has passed
Details
travis-ci/mbed2-STM/ Local mbed2-STM testing has passed
Details

@andrewleech andrewleech deleted the andrewleech:nRF5XPalGattClient_include_new branch Feb 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment