Merge pull request #675 from pyro9/fix_extern

hathach · web-flow · commit 83c21dc06f80 · 2021-07-13T22:09:27.000+07:00
Allow common_func.h to compile without error when it is included inside extern "C"
diff --git a/cores/nRF5/common_func.h b/cores/nRF5/common_func.h
@@ -39,6 +39,7 @@
 
 
 #ifdef __cplusplus
+  extern "C++" {
   // namespace and templates must be outside the `extern "C"` declaration...
   namespace ADAFRUIT_DETAIL
   {
@@ -48,6 +49,7 @@
           return N;
       }
   }
+  }
   extern "C" {
   #define arrcount(arr) ADAFRUIT_DETAIL::arrcount_fails_if_not_array(arr)
   #define ADA_STATIC_ASSERT(const_expr, message)   static_assert(const_expr, message)

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`
`40`	`40`
`41`	`41`	`#ifdef __cplusplus`
	`42`	`+ extern "C++" {`
`42`	`43`	// namespace and templates must be outside the `extern "C"` declaration...
`43`	`44`	`namespace ADAFRUIT_DETAIL`
`44`	`45`	`{`
`@@ -48,6 +49,7 @@`
`48`	`49`	`return N;`
`49`	`50`	`}`
`50`	`51`	`}`
	`52`	`+ }`
`51`	`53`	`extern "C" {`
`52`	`54`	`#define arrcount(arr) ADAFRUIT_DETAIL::arrcount_fails_if_not_array(arr)`
`53`	`55`	`#define ADA_STATIC_ASSERT(const_expr, message) static_assert(const_expr, message)`