From 196920ee9153c6d69c6bc25192dcc0f06fe99f04 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 17 Jun 2020 15:54:40 +1000 Subject: [PATCH] Spell out std::unique_ptr constructor calls --- internal/cgen/cgen.go | 5 ++- release/c/wuffs-unsupported-snapshot.c | 55 +++++++++++++++----------- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index bd004077..ea4cae14 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -1166,14 +1166,15 @@ func (g *gen) writeCppMethods(b *buffer, n *a.Struct) error { b.writes("// On failure, the alloc_etc functions return nullptr. They don't throw.\n\n") b.writes("static inline unique_ptr\n") b.writes("alloc() {\n") - b.printf("return unique_ptr(%s%s__alloc(), &free);\n", g.pkgPrefix, structName) + b.printf("return std::unique_ptr<%s%s, decltype(&free)>(\n%s%s__alloc(), &free);\n", + g.pkgPrefix, structName, g.pkgPrefix, structName) b.writes("}\n") for _, impl := range n.Implements() { iQID := impl.AsTypeExpr().QID() iName := fmt.Sprintf("wuffs_%s__%s", iQID[0].Str(g.tm), iQID[1].Str(g.tm)) b.printf("\nstatic inline %s::unique_ptr\n", iName) b.printf("alloc_as__%s() {\n", iName) - b.printf("return %s::unique_ptr(\n%s%s__alloc_as__%s(), &free);\n", + b.printf("return std::unique_ptr<%s, decltype(&free)>(\n%s%s__alloc_as__%s(), &free);\n", iName, g.pkgPrefix, structName, iName) b.printf("}\n") } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index e4d7f9be..090021be 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -4686,12 +4686,13 @@ struct wuffs_adler32__hasher__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_adler32__hasher__alloc(), &free); + return std::unique_ptr( + wuffs_adler32__hasher__alloc(), &free); } static inline wuffs_base__hasher_u32::unique_ptr alloc_as__wuffs_base__hasher_u32() { - return wuffs_base__hasher_u32::unique_ptr( + return std::unique_ptr( wuffs_adler32__hasher__alloc_as__wuffs_base__hasher_u32(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -4961,12 +4962,13 @@ struct wuffs_bmp__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_bmp__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_bmp__decoder__alloc(), &free); } static inline wuffs_base__image_decoder::unique_ptr alloc_as__wuffs_base__image_decoder() { - return wuffs_base__image_decoder::unique_ptr( + return std::unique_ptr( wuffs_bmp__decoder__alloc_as__wuffs_base__image_decoder(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -5201,12 +5203,13 @@ struct wuffs_crc32__ieee_hasher__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_crc32__ieee_hasher__alloc(), &free); + return std::unique_ptr( + wuffs_crc32__ieee_hasher__alloc(), &free); } static inline wuffs_base__hasher_u32::unique_ptr alloc_as__wuffs_base__hasher_u32() { - return wuffs_base__hasher_u32::unique_ptr( + return std::unique_ptr( wuffs_crc32__ieee_hasher__alloc_as__wuffs_base__hasher_u32(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -5455,12 +5458,13 @@ struct wuffs_deflate__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_deflate__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_deflate__decoder__alloc(), &free); } static inline wuffs_base__io_transformer::unique_ptr alloc_as__wuffs_base__io_transformer() { - return wuffs_base__io_transformer::unique_ptr( + return std::unique_ptr( wuffs_deflate__decoder__alloc_as__wuffs_base__io_transformer(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -5683,12 +5687,13 @@ struct wuffs_lzw__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_lzw__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_lzw__decoder__alloc(), &free); } static inline wuffs_base__io_transformer::unique_ptr alloc_as__wuffs_base__io_transformer() { - return wuffs_base__io_transformer::unique_ptr( + return std::unique_ptr( wuffs_lzw__decoder__alloc_as__wuffs_base__io_transformer(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -6127,12 +6132,13 @@ struct wuffs_gif__config_decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_gif__config_decoder__alloc(), &free); + return std::unique_ptr( + wuffs_gif__config_decoder__alloc(), &free); } static inline wuffs_base__image_decoder::unique_ptr alloc_as__wuffs_base__image_decoder() { - return wuffs_base__image_decoder::unique_ptr( + return std::unique_ptr( wuffs_gif__config_decoder__alloc_as__wuffs_base__image_decoder(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -6390,12 +6396,13 @@ struct wuffs_gif__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_gif__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_gif__decoder__alloc(), &free); } static inline wuffs_base__image_decoder::unique_ptr alloc_as__wuffs_base__image_decoder() { - return wuffs_base__image_decoder::unique_ptr( + return std::unique_ptr( wuffs_gif__decoder__alloc_as__wuffs_base__image_decoder(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -6663,12 +6670,13 @@ struct wuffs_gzip__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_gzip__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_gzip__decoder__alloc(), &free); } static inline wuffs_base__io_transformer::unique_ptr alloc_as__wuffs_base__io_transformer() { - return wuffs_base__io_transformer::unique_ptr( + return std::unique_ptr( wuffs_gzip__decoder__alloc_as__wuffs_base__io_transformer(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -6930,12 +6938,13 @@ struct wuffs_json__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_json__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_json__decoder__alloc(), &free); } static inline wuffs_base__token_decoder::unique_ptr alloc_as__wuffs_base__token_decoder() { - return wuffs_base__token_decoder::unique_ptr( + return std::unique_ptr( wuffs_json__decoder__alloc_as__wuffs_base__token_decoder(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -7197,12 +7206,13 @@ struct wuffs_wbmp__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_wbmp__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_wbmp__decoder__alloc(), &free); } static inline wuffs_base__image_decoder::unique_ptr alloc_as__wuffs_base__image_decoder() { - return wuffs_base__image_decoder::unique_ptr( + return std::unique_ptr( wuffs_wbmp__decoder__alloc_as__wuffs_base__image_decoder(), &free); } #endif // defined(WUFFS_HAS_CPP11) @@ -7485,12 +7495,13 @@ struct wuffs_zlib__decoder__struct { static inline unique_ptr alloc() { - return unique_ptr(wuffs_zlib__decoder__alloc(), &free); + return std::unique_ptr( + wuffs_zlib__decoder__alloc(), &free); } static inline wuffs_base__io_transformer::unique_ptr alloc_as__wuffs_base__io_transformer() { - return wuffs_base__io_transformer::unique_ptr( + return std::unique_ptr( wuffs_zlib__decoder__alloc_as__wuffs_base__io_transformer(), &free); } #endif // defined(WUFFS_HAS_CPP11)