Skip to content

Commit 3c8f31e

Browse files
author
Amanda Butler
authored
Merge pull request #1091 from ARMmbed/AnotherButler-patch-6
Remove Arm Compiler 5 from style.md
2 parents 0caa0dc + 5e8fad2 commit 3c8f31e

File tree

1 file changed

+3
-3
lines changed
  • docs/reference/contributing/guidelines

1 file changed

+3
-3
lines changed

docs/reference/contributing/guidelines/style.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ All functions and methods should contain documentation using Doxygen.
169169

170170
## Compiler settings
171171

172-
All C and C++ code submitted to Mbed OS must compile with GCC Arm Embedded, Arm Compiler 5 and IAR EWARM. Mbed OS:
172+
All C and C++ code submitted to Mbed OS must compile with GCC Arm Embedded, Arm Compiler 6 and IAR EWARM. Mbed OS:
173173

174-
- Uses the GNU99 standard for C.
175-
- Uses the GNU++98 standard for C++.
174+
- Uses the GNU11 standard for C.
175+
- Uses the GNU++14 standard for C++.
176176
- Sets the `char` type to unsigned.
177177
- Disables C++ exceptions.
178178
- Disables C++ runtime type information.

0 commit comments

Comments
 (0)