From f2ed33375c7e04035ff5a0391678114053c5c0b1 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 11 Mar 2021 10:52:49 +1100 Subject: [PATCH] Gate wuffs_aux on WUFFS_BASE__HAVE_UNIQUE_PTR --- cmd/wuffs-c/release.go | 8 ++++---- release/c/wuffs-unsupported-snapshot.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/wuffs-c/release.go b/cmd/wuffs-c/release.go index 89cb6719..f89e0055 100644 --- a/cmd/wuffs-c/release.go +++ b/cmd/wuffs-c/release.go @@ -107,14 +107,14 @@ func doGenrelease(args []string) error { } } - out.WriteString("#if defined(__cplusplus) && (__cplusplus >= 201103L)\n\n") + out.WriteString("#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)\n\n") out.WriteString(data.AuxBaseHh) out.WriteString("\n") for _, f := range data.AuxNonBaseHhFiles { out.WriteString(f) out.WriteString("\n") } - out.WriteString("#endif // defined(__cplusplus) && (__cplusplus >= 201103L)\n") + out.WriteString("#endif // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)\n") out.Write(grImplStartsHere) out.WriteString("\n") @@ -126,14 +126,14 @@ func doGenrelease(args []string) error { } } - out.WriteString("#if defined(__cplusplus) && (__cplusplus >= 201103L)\n\n") + out.WriteString("#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)\n\n") out.WriteString(data.AuxBaseCc) out.WriteString("\n") for _, f := range data.AuxNonBaseCcFiles { out.WriteString(f) out.WriteString("\n") } - out.WriteString("#endif // defined(__cplusplus) && (__cplusplus >= 201103L)\n\n") + out.WriteString("#endif // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)\n\n") out.Write(grImplEndsHere) out.WriteString(grPragmaPop) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index a702e3d7..cea611fa 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -9269,7 +9269,7 @@ struct wuffs_wbmp__decoder__struct { #endif // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION) -#if defined(__cplusplus) && (__cplusplus >= 201103L) +#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) // ---------------- Auxiliary - Base @@ -9637,7 +9637,7 @@ DecodeJson(DecodeJsonCallbacks& callbacks, } // namespace wuffs_aux -#endif // defined(__cplusplus) && (__cplusplus >= 201103L) +#endif // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) // WUFFS C HEADER ENDS HERE. #ifdef WUFFS_IMPLEMENTATION @@ -36299,7 +36299,7 @@ wuffs_wbmp__decoder__workbuf_len( #endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__WBMP) -#if defined(__cplusplus) && (__cplusplus >= 201103L) +#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) // ---------------- Auxiliary - Base @@ -37611,7 +37611,7 @@ done: #endif // !defined(WUFFS_CONFIG__MODULES) || // defined(WUFFS_CONFIG__MODULE__AUX__JSON) -#endif // defined(__cplusplus) && (__cplusplus >= 201103L) +#endif // defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR) #endif // WUFFS_IMPLEMENTATION