mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Roll back 196920ee unique_ptr constructors
Commit 196920ee91 "Spell out
std::unique_ptr constructor calls" did not fix compiler errors with
older MSVC versions as hoped.
This commit is contained in:
1 parent
a7418b76fc
commit
025f9c208e
2 files changed
+24
-36
No files matched your search
@@ -1166,15 +1166,14 @@ 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 std::unique_ptr<%s%s, decltype(&free)>(\n%s%s__alloc(), &free);\n",
|
||||
g.pkgPrefix, structName, g.pkgPrefix, structName)
|
||||
b.printf("return unique_ptr(%s%s__alloc(), &free);\n", 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 std::unique_ptr<%s, decltype(&free)>(\n%s%s__alloc_as__%s(), &free);\n",
|
||||
b.printf("return %s::unique_ptr(\n%s%s__alloc_as__%s(), &free);\n",
|
||||
iName, g.pkgPrefix, structName, iName)
|
||||
b.printf("}\n")
|
||||
}
|
||||
|
||||
@@ -4686,13 +4686,12 @@ struct wuffs_adler32__hasher__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_adler32__hasher, decltype(&free)>(
|
||||
wuffs_adler32__hasher__alloc(), &free);
|
||||
return unique_ptr(wuffs_adler32__hasher__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__hasher_u32::unique_ptr
|
||||
alloc_as__wuffs_base__hasher_u32() {
|
||||
return std::unique_ptr<wuffs_base__hasher_u32, decltype(&free)>(
|
||||
return wuffs_base__hasher_u32::unique_ptr(
|
||||
wuffs_adler32__hasher__alloc_as__wuffs_base__hasher_u32(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -4962,13 +4961,12 @@ struct wuffs_bmp__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_bmp__decoder, decltype(&free)>(
|
||||
wuffs_bmp__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_bmp__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__image_decoder::unique_ptr
|
||||
alloc_as__wuffs_base__image_decoder() {
|
||||
return std::unique_ptr<wuffs_base__image_decoder, decltype(&free)>(
|
||||
return wuffs_base__image_decoder::unique_ptr(
|
||||
wuffs_bmp__decoder__alloc_as__wuffs_base__image_decoder(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -5203,13 +5201,12 @@ struct wuffs_crc32__ieee_hasher__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_crc32__ieee_hasher, decltype(&free)>(
|
||||
wuffs_crc32__ieee_hasher__alloc(), &free);
|
||||
return unique_ptr(wuffs_crc32__ieee_hasher__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__hasher_u32::unique_ptr
|
||||
alloc_as__wuffs_base__hasher_u32() {
|
||||
return std::unique_ptr<wuffs_base__hasher_u32, decltype(&free)>(
|
||||
return wuffs_base__hasher_u32::unique_ptr(
|
||||
wuffs_crc32__ieee_hasher__alloc_as__wuffs_base__hasher_u32(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -5458,13 +5455,12 @@ struct wuffs_deflate__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_deflate__decoder, decltype(&free)>(
|
||||
wuffs_deflate__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_deflate__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_transformer::unique_ptr
|
||||
alloc_as__wuffs_base__io_transformer() {
|
||||
return std::unique_ptr<wuffs_base__io_transformer, decltype(&free)>(
|
||||
return wuffs_base__io_transformer::unique_ptr(
|
||||
wuffs_deflate__decoder__alloc_as__wuffs_base__io_transformer(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -5687,13 +5683,12 @@ struct wuffs_lzw__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_lzw__decoder, decltype(&free)>(
|
||||
wuffs_lzw__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_lzw__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_transformer::unique_ptr
|
||||
alloc_as__wuffs_base__io_transformer() {
|
||||
return std::unique_ptr<wuffs_base__io_transformer, decltype(&free)>(
|
||||
return wuffs_base__io_transformer::unique_ptr(
|
||||
wuffs_lzw__decoder__alloc_as__wuffs_base__io_transformer(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -6132,13 +6127,12 @@ struct wuffs_gif__config_decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_gif__config_decoder, decltype(&free)>(
|
||||
wuffs_gif__config_decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_gif__config_decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__image_decoder::unique_ptr
|
||||
alloc_as__wuffs_base__image_decoder() {
|
||||
return std::unique_ptr<wuffs_base__image_decoder, decltype(&free)>(
|
||||
return wuffs_base__image_decoder::unique_ptr(
|
||||
wuffs_gif__config_decoder__alloc_as__wuffs_base__image_decoder(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -6396,13 +6390,12 @@ struct wuffs_gif__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_gif__decoder, decltype(&free)>(
|
||||
wuffs_gif__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_gif__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__image_decoder::unique_ptr
|
||||
alloc_as__wuffs_base__image_decoder() {
|
||||
return std::unique_ptr<wuffs_base__image_decoder, decltype(&free)>(
|
||||
return wuffs_base__image_decoder::unique_ptr(
|
||||
wuffs_gif__decoder__alloc_as__wuffs_base__image_decoder(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -6670,13 +6663,12 @@ struct wuffs_gzip__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_gzip__decoder, decltype(&free)>(
|
||||
wuffs_gzip__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_gzip__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_transformer::unique_ptr
|
||||
alloc_as__wuffs_base__io_transformer() {
|
||||
return std::unique_ptr<wuffs_base__io_transformer, decltype(&free)>(
|
||||
return wuffs_base__io_transformer::unique_ptr(
|
||||
wuffs_gzip__decoder__alloc_as__wuffs_base__io_transformer(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -6938,13 +6930,12 @@ struct wuffs_json__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_json__decoder, decltype(&free)>(
|
||||
wuffs_json__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_json__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__token_decoder::unique_ptr
|
||||
alloc_as__wuffs_base__token_decoder() {
|
||||
return std::unique_ptr<wuffs_base__token_decoder, decltype(&free)>(
|
||||
return wuffs_base__token_decoder::unique_ptr(
|
||||
wuffs_json__decoder__alloc_as__wuffs_base__token_decoder(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -7206,13 +7197,12 @@ struct wuffs_wbmp__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_wbmp__decoder, decltype(&free)>(
|
||||
wuffs_wbmp__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_wbmp__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__image_decoder::unique_ptr
|
||||
alloc_as__wuffs_base__image_decoder() {
|
||||
return std::unique_ptr<wuffs_base__image_decoder, decltype(&free)>(
|
||||
return wuffs_base__image_decoder::unique_ptr(
|
||||
wuffs_wbmp__decoder__alloc_as__wuffs_base__image_decoder(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
@@ -7495,13 +7485,12 @@ struct wuffs_zlib__decoder__struct {
|
||||
|
||||
static inline unique_ptr
|
||||
alloc() {
|
||||
return std::unique_ptr<wuffs_zlib__decoder, decltype(&free)>(
|
||||
wuffs_zlib__decoder__alloc(), &free);
|
||||
return unique_ptr(wuffs_zlib__decoder__alloc(), &free);
|
||||
}
|
||||
|
||||
static inline wuffs_base__io_transformer::unique_ptr
|
||||
alloc_as__wuffs_base__io_transformer() {
|
||||
return std::unique_ptr<wuffs_base__io_transformer, decltype(&free)>(
|
||||
return wuffs_base__io_transformer::unique_ptr(
|
||||
wuffs_zlib__decoder__alloc_as__wuffs_base__io_transformer(), &free);
|
||||
}
|
||||
#endif // defined(WUFFS_HAS_CPP11)
|
||||
|
||||
Reference in new issue
Block a user