Merge pull request #10805 from kjbracey-arm/armc5_blinky

Fix ARMC5 compilation
pull/10812/head
Anna Bridge 2019-06-11 15:07:43 +01:00 committed by GitHub
commit fc645bc3ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
#include "ns_list.h"
#include "netsocket/NetworkInterface.h"
#include "netsocket/NetworkStack.h"
#include "platform/Callback.h"
#include "platform/mbed_error.h"
#include <string.h>
#include "ns_list.h"
// Default network-interface state
void NetworkInterface::set_as_default()

View File

@ -131,8 +131,8 @@ struct SingletonPtr {
// This is zero initialized when in global scope
mutable void *_ptr;
#if __cplusplus >= 201103L
// Align data appropriately
#if __cplusplus >= 201103L && !defined __CC_ARM
// Align data appropriately (ARM Compiler 5 does not support alignas in C++11 mode)
alignas(T) mutable char _data[sizeof(T)];
#else
// Force data to be 8 byte aligned