mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
159 lines
4.6 KiB
Diff
159 lines
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: PJ Reiniger <pj.reiniger@gmail.com>
|
|
Date: Sat, 29 Oct 2022 12:22:50 -0400
|
|
Subject: [PATCH 3/4] Use namespace for C++
|
|
|
|
---
|
|
src/mpack/mpack-common.c | 2 ++
|
|
src/mpack/mpack-expect.c | 2 ++
|
|
src/mpack/mpack-node.c | 2 ++
|
|
src/mpack/mpack-platform.c | 2 ++
|
|
src/mpack/mpack-platform.h | 2 +-
|
|
src/mpack/mpack-reader.c | 2 ++
|
|
src/mpack/mpack-writer.c | 2 ++
|
|
src/mpack/mpack-writer.h | 3 ++-
|
|
8 files changed, 15 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/mpack/mpack-common.c b/src/mpack/mpack-common.c
|
|
index fb76a432bbe9e0ce6e39ffc29cbae3bc273efa83..1f9c078c2215436cc999a9447abe66250031e775 100644
|
|
--- a/src/mpack/mpack-common.c
|
|
+++ b/src/mpack/mpack-common.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "mpack-common.h"
|
|
|
|
MPACK_SILENCE_WARNINGS_BEGIN
|
|
+namespace mpack {
|
|
|
|
const char* mpack_error_to_string(mpack_error_t error) {
|
|
#if MPACK_STRINGS
|
|
@@ -748,4 +749,5 @@ void mpack_print_file_callback(void* context, const char* data, size_t count) {
|
|
}
|
|
#endif
|
|
|
|
+} // namespace mpack
|
|
MPACK_SILENCE_WARNINGS_END
|
|
diff --git a/src/mpack/mpack-expect.c b/src/mpack/mpack-expect.c
|
|
index 81576d1e0e7b942e93a27a6dd5a75a751dba2384..44f00ffc5387b5646d700b174283dec12f2c4962 100644
|
|
--- a/src/mpack/mpack-expect.c
|
|
+++ b/src/mpack/mpack-expect.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "mpack-expect.h"
|
|
|
|
MPACK_SILENCE_WARNINGS_BEGIN
|
|
+namespace mpack {
|
|
|
|
#if MPACK_EXPECT
|
|
|
|
@@ -880,4 +881,5 @@ size_t mpack_expect_key_cstr(mpack_reader_t* reader, const char* keys[], bool fo
|
|
|
|
#endif
|
|
|
|
+} // namespace mpack
|
|
MPACK_SILENCE_WARNINGS_END
|
|
diff --git a/src/mpack/mpack-node.c b/src/mpack/mpack-node.c
|
|
index 8af1562d4bc27ec708d3af9e3d3cc03ae9719005..a1fdf4fa00c99ee00bbe36d1ee6911bf8d6be1f2 100644
|
|
--- a/src/mpack/mpack-node.c
|
|
+++ b/src/mpack/mpack-node.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "mpack-node.h"
|
|
|
|
MPACK_SILENCE_WARNINGS_BEGIN
|
|
+namespace mpack {
|
|
|
|
#if MPACK_NODE
|
|
|
|
@@ -2401,4 +2402,5 @@ mpack_node_t mpack_node_map_value_at(mpack_node_t node, size_t index) {
|
|
|
|
#endif
|
|
|
|
+} // namespace mpack
|
|
MPACK_SILENCE_WARNINGS_END
|
|
diff --git a/src/mpack/mpack-platform.c b/src/mpack/mpack-platform.c
|
|
index d4a2fa3198f39fc964baeed4d15f6fd89affc24c..aadeee0f9de0833a5eabe3a7efc41a9ddf5cee70 100644
|
|
--- a/src/mpack/mpack-platform.c
|
|
+++ b/src/mpack/mpack-platform.c
|
|
@@ -30,6 +30,7 @@
|
|
#include "mpack.h"
|
|
|
|
MPACK_SILENCE_WARNINGS_BEGIN
|
|
+namespace mpack {
|
|
|
|
#if MPACK_DEBUG
|
|
|
|
@@ -218,4 +219,5 @@ void* mpack_realloc(void* old_ptr, size_t used_size, size_t new_size) {
|
|
}
|
|
#endif
|
|
|
|
+} // namespace mpack
|
|
MPACK_SILENCE_WARNINGS_END
|
|
diff --git a/src/mpack/mpack-platform.h b/src/mpack/mpack-platform.h
|
|
index 79604c90828ebbeae52eb3d6c13afeec6b861fa9..27a2f9eeb10cc8c6aa274a5e1b0c96bead6a37fb 100644
|
|
--- a/src/mpack/mpack-platform.h
|
|
+++ b/src/mpack/mpack-platform.h
|
|
@@ -1043,7 +1043,7 @@ void mpack_assert_fail(const char* message);
|
|
*/
|
|
|
|
#ifdef __cplusplus
|
|
- #define MPACK_EXTERN_C_BEGIN extern "C" {
|
|
+ #define MPACK_EXTERN_C_BEGIN namespace mpack {
|
|
#define MPACK_EXTERN_C_END }
|
|
#else
|
|
#define MPACK_EXTERN_C_BEGIN /*nothing*/
|
|
diff --git a/src/mpack/mpack-reader.c b/src/mpack/mpack-reader.c
|
|
index dfac4c2dd51e2d6f18b029a729c9929d8356e03d..da49bda12c7b900561460e49edf8382c99b19cae 100644
|
|
--- a/src/mpack/mpack-reader.c
|
|
+++ b/src/mpack/mpack-reader.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "mpack-reader.h"
|
|
|
|
MPACK_SILENCE_WARNINGS_BEGIN
|
|
+namespace mpack {
|
|
|
|
#if MPACK_READER
|
|
|
|
@@ -1284,4 +1285,5 @@ void mpack_print_stdfile_to_callback(FILE* file, mpack_print_callback_t callback
|
|
|
|
#endif
|
|
|
|
+} // namespace mpack
|
|
MPACK_SILENCE_WARNINGS_END
|
|
diff --git a/src/mpack/mpack-writer.c b/src/mpack/mpack-writer.c
|
|
index 029b0651549c783c9c4076244b76fa8f2974d4f8..f72b538659afa39a43359292487ff6fe2370eeb2 100644
|
|
--- a/src/mpack/mpack-writer.c
|
|
+++ b/src/mpack/mpack-writer.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "mpack-writer.h"
|
|
|
|
MPACK_SILENCE_WARNINGS_BEGIN
|
|
+namespace mpack {
|
|
|
|
#if MPACK_WRITER
|
|
|
|
@@ -1827,4 +1828,5 @@ void mpack_complete_array(mpack_writer_t* writer) {
|
|
#endif // MPACK_BUILDER
|
|
#endif // MPACK_WRITER
|
|
|
|
+} // namespace mpack
|
|
MPACK_SILENCE_WARNINGS_END
|
|
diff --git a/src/mpack/mpack-writer.h b/src/mpack/mpack-writer.h
|
|
index d842a3fc48fbd5693553fcf7693e2dc06f1a2b5e..5fcd009ccaf24ef2e76c24042167e15d538214d9 100644
|
|
--- a/src/mpack/mpack-writer.h
|
|
+++ b/src/mpack/mpack-writer.h
|
|
@@ -1168,6 +1168,7 @@ MPACK_EXTERN_C_END
|
|
|
|
#if defined(__cplusplus) || defined(MPACK_DOXYGEN)
|
|
|
|
+namespace mpack {
|
|
/**
|
|
* @name C++ write overloads
|
|
* @{
|
|
@@ -1304,7 +1305,7 @@ MPACK_INLINE void mpack_write_kv(mpack_writer_t* writer, const char *key, const
|
|
/**
|
|
* @}
|
|
*/
|
|
-
|
|
+} // namespace mpack
|
|
#endif /* __cplusplus */
|
|
|
|
/**
|