Skip to content

Commit cc49181

Browse files
0xc01700xc0170
authored
Merge pull request #10427 from kjbracey-arm/new_standards
Set compilers to C++14 and C11
2 parents 8fc2a3c + b437d70 commit cc49181

40 files changed

+99
-68
lines changed

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ class MbedTesterBlockDevice : public BlockDevice {
185185

186186
uint8_t cmd[] = {
187187
0x0B, // Fast read
188-
(addr >> (2 * 8)) & 0xFF, // Address
189-
(addr >> (1 * 8)) & 0xFF,
190-
(addr >> (0 * 8)) & 0xFF,
188+
(uint8_t)(addr >> (2 * 8)), // Address
189+
(uint8_t)(addr >> (1 * 8)),
190+
(uint8_t)(addr >> (0 * 8)),
191191
0x00 // Dummy
192192
};
193193
_write((char *)cmd, sizeof(cmd), NULL, 0);

‎features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -854,8 +854,8 @@ ble_error_t nRF5xGap::setPhy_(
854854
#else
855855
// TODO handle coded symbol once supported by the softdevice.
856856
ble_gap_phys_t gap_phys = {
857-
txPhys? txPhys->value() : 0,
858-
rxPhys? rxPhys->value() : 0
857+
txPhys? txPhys->value() : uint8_t(0),
858+
rxPhys? rxPhys->value() : uint8_t(0)
859859
};
860860

861861
uint32_t err = sd_ble_gap_phy_update(connection, &gap_phys);
@@ -1819,8 +1819,8 @@ void nRF5xGap::on_phy_update_request(
18191819
const ble_gap_evt_phy_update_request_t& evt
18201820
) {
18211821
ble_gap_phys_t phys = {
1822-
_preferred_tx_phys & evt.peer_preferred_phys.tx_phys,
1823-
_preferred_rx_phys & evt.peer_preferred_phys.rx_phys
1822+
static_cast<uint8_t>(_preferred_tx_phys & evt.peer_preferred_phys.tx_phys),
1823+
static_cast<uint8_t>(_preferred_rx_phys & evt.peer_preferred_phys.rx_phys)
18241824
};
18251825

18261826
if (!phys.tx_phys) {

‎tools/export/coide/arch_max.coproj.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>

‎tools/export/coide/arch_pro.coproj.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Includepaths>
1111
{% for path in include_paths %} <Includepath path="{{path}}"/> {% endfor %}
1212
</Includepaths>

‎tools/export/coide/disco_f051r8.coproj.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>
@@ -84,7 +84,7 @@
8484
<Compile>
8585
<Option name="OptimizationLevel" value="0"/>
8686
<Option name="UseFPU" value="0"/>
87-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
87+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
8888
<Option name="FPU" value="1"/>
8989
<Option name="SupportCPlusplus" value="1"/>
9090
<Includepaths>

‎tools/export/coide/disco_f100rb.coproj.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>
@@ -84,7 +84,7 @@
8484
<Compile>
8585
<Option name="OptimizationLevel" value="0"/>
8686
<Option name="UseFPU" value="0"/>
87-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
87+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
8888
<Option name="FPU" value="1"/>
8989
<Option name="SupportCPlusplus" value="1"/>
9090
<Includepaths>

‎tools/export/coide/disco_f303vc.coproj.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>

‎tools/export/coide/disco_f334c8.coproj.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>

‎tools/export/coide/disco_f401vc.coproj.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>
@@ -85,7 +85,7 @@
8585
<Compile>
8686
<Option name="OptimizationLevel" value="0"/>
8787
<Option name="UseFPU" value="0"/>
88-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
88+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
8989
<Option name="FPU" value="1"/>
9090
<Option name="SupportCPlusplus" value="1"/>
9191
<Includepaths>

‎tools/export/coide/disco_f407vg.coproj.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Compile>
77
<Option name="OptimizationLevel" value="4"/>
88
<Option name="UseFPU" value="0"/>
9-
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
9+
<Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++14"/>
1010
<Option name="FPU" value="1"/>
1111
<Option name="SupportCPlusplus" value="1"/>
1212
<Includepaths>

0 commit comments

Comments
 (0)