riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8329 from fvacek/master

Browse Source 
examples: superfluous extern "C" in c++ example removed
This commit is contained in:
Alexandre Abadie 2018-01-18 15:38:12 +01:00 committed by GitHub
commit 0272c8f44c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/riot_and_cpp/c_functions.h
View File

@ -22,6 +22,11 @@
#ifndef C_FUNCTIONS_H #ifndef C_FUNCTIONS_H
#define C_FUNCTIONS_H #define C_FUNCTIONS_H
/*
* all headers defining c functions must be marked as extern "C" when included
* into c++ sources
*/
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

5
examples/riot_and_cpp/main.cpp
View File

@ -21,14 +21,9 @@
* @author DangNhat Pham-Huu <51002279@hcmut.edu.vn> * @author DangNhat Pham-Huu <51002279@hcmut.edu.vn>
*/ */
/*
* all included headers defining c functions, i.e. all RIOT functions, must be marked as extern "C"
*/
extern "C" {
#include "thread.h" #include "thread.h"
#include "c_functions.h" #include "c_functions.h"
}
#include <cstdio> #include <cstdio>
#include <vector> #include <vector>