diff options
author | David Sidrane <david_s5@nscdg.com> | 2015-02-19 06:47:13 -1000 |
---|---|---|
committer | David Sidrane <david_s5@nscdg.com> | 2015-04-07 07:49:06 -1000 |
commit | 94c0dfa65220066540fc7f0046534019ce5191cf (patch) | |
tree | a01d066afa0beed16ca94709b5d9879882e99747 | |
parent | d3e2787dead79de2471ff50ada19e1ae2fee7065 (diff) | |
download | px4-firmware-94c0dfa65220066540fc7f0046534019ce5191cf.tar.gz px4-firmware-94c0dfa65220066540fc7f0046534019ce5191cf.tar.bz2 px4-firmware-94c0dfa65220066540fc7f0046534019ce5191cf.zip |
Latest Intrim C++11 workaround waitng on feedback
-rw-r--r-- | nuttx-patches/ctime.patch | 12 | ||||
-rw-r--r-- | nuttx-patches/wchar.h.patch | 57 |
2 files changed, 0 insertions, 69 deletions
diff --git a/nuttx-patches/ctime.patch b/nuttx-patches/ctime.patch deleted file mode 100644 index 4d8b1fd0f..000000000 --- a/nuttx-patches/ctime.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git NuttX/nuttx/include/cxx/ctime NuttX/nuttx/include/cxx/ctime -index 3d3dfae..18fdded 100644 ---- NuttX/nuttx/include/cxx/ctime -+++ NuttX/nuttx/include/cxx/ctime -@@ -53,7 +53,6 @@ namespace std - using ::clockid_t; - using ::timer_t; - using ::timespec; -- using ::timeval; - using ::tm; - using ::itimerspec; - using ::sigevent; diff --git a/nuttx-patches/wchar.h.patch b/nuttx-patches/wchar.h.patch deleted file mode 100644 index 716db992e..000000000 --- a/nuttx-patches/wchar.h.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git NuttX/nuttx/include/wchar.h NuttX/nuttx/include/wchar.h -index 54fa796..889b272 100644 ---- NuttX/nuttx/include/wchar.h -+++ NuttX/nuttx/include/wchar.h -@@ -118,7 +118,19 @@ typedef int wint_t; - * Reference: Opengroup.org - */ - --struct tm; /* Forward reference (see <time.h>) */ -+ struct tm; /* Forward reference (see <time.h>) */ -+ -+/* An object type other than an array type that can hold the conversion state -+ * information necessary to convert between sequences of (possibly multi-byte) -+ * characters and wide characters. If a codeset is being -+ * used such that an mbstate_t needs to preserve more than two levels of -+ * reserved state, the results are unspecified. -+ */ -+ -+typedef struct -+{ -+ int __fill[6]; -+} mbstate_t; - - /**************************************************************************** - * Public Data -@@ -142,7 +154,18 @@ extern "C" - * Reference: Opengroup.org - */ - --#if 0 /* Not yet implemented */ -+ -+#ifndef _WCTYPE_T -+#define _WCTYPE_T -+# ifdef _AEABI_PORTABLE -+typedef void *wctype_t; -+# else -+typedef int wctype_t; -+# endif -+#endif /* !_WCTYPE_T */ -+ -+ /* Not yet implemented */ -+ - wint_t btowc(int); - int fwprintf(FILE *, const wchar_t *, ...); - int fwscanf(FILE *, const wchar_t *, ...); -@@ -218,7 +241,10 @@ wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); - wchar_t *wmemset(wchar_t *, wchar_t, size_t); - int wprintf(const wchar_t *, ...); - int wscanf(const wchar_t *, ...); --#endif -+int vfwscanf(FILE *, const wchar_t *, va_list); -+int vswscanf(const wchar_t *, const wchar_t *, va_list); -+int vwscanf(const wchar_t *, va_list); -+float wcstof(const wchar_t *, wchar_t **); - - #undef EXTERN - #ifdef __cplusplus |