mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-17 19:08:15 +08:00
f4456c1b97
Fix one of [32398](https://github.com/microsoft/vcpkg/issues/32398) issue. ``` /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.hxx:38:49: error: ISO C++17 does not allow dynamic exception specifications 38 | operator new (std::size_t, odb::details::share) throw (std::bad_alloc); | ^~~~~ /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.hxx:65:34: error: ISO C++17 does not allow dynamic exception specifications 65 | operator new (std::size_t) throw (std::bad_alloc); | ^~~~~ /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.hxx:68:41: error: ISO C++17 does not allow dynamic exception specifications 68 | operator new (std::size_t, share) throw (std::bad_alloc); | ^~~~~ In file included from /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.hxx:108, from /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.cxx:5: /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.ixx:67:34: error: ISO C++17 does not allow dynamic exception specifications 67 | operator new (std::size_t n) throw (std::bad_alloc) | ^~~~~ /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.ixx:73:41: error: ISO C++17 does not allow dynamic exception specifications 73 | operator new (std::size_t n, share) throw (std::bad_alloc) | ^~~~~ /mnt/vcpkg/buildtrees/libodb/src/libodb-2-59eaf93c2b.clean/odb/details/shared-ptr/base.cxx:57:48: error: ISO C++17 does not allow dynamic exception specifications 57 | operator new (size_t n, odb::details::share s) throw (std::bad_alloc) ``` Fix the syntax not supported by C++17 and modify the export file name. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~~SHA512s are updated for each updated download.~~ - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [X] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. Usage test pass with following triplets: ``` x64-windows ``` Compile test pass with following triplets: ``` x64-windows x64-linux ```
95 lines
2.6 KiB
Diff
95 lines
2.6 KiB
Diff
diff --git a/odb/details/shared-ptr/base.cxx b/odb/details/shared-ptr/base.cxx
|
|
index b95797b..6cf8ed7 100644
|
|
--- a/odb/details/shared-ptr/base.cxx
|
|
+++ b/odb/details/shared-ptr/base.cxx
|
|
@@ -54,7 +54,7 @@ namespace odb
|
|
}
|
|
|
|
void*
|
|
-operator new (size_t n, odb::details::share s) throw (std::bad_alloc)
|
|
+operator new (size_t n, odb::details::share s)
|
|
{
|
|
if (s == odb::details::shared)
|
|
{
|
|
@@ -74,7 +74,7 @@ operator new (size_t n, odb::details::share s) throw (std::bad_alloc)
|
|
}
|
|
|
|
void
|
|
-operator delete (void* p, odb::details::share s) throw ()
|
|
+operator delete (void* p, odb::details::share s)
|
|
{
|
|
// This version of operator delete is only called when the c-tor
|
|
// fails. In this case there is no object and we can just free the
|
|
diff --git a/odb/details/shared-ptr/base.hxx b/odb/details/shared-ptr/base.hxx
|
|
index 4a38945..1c951a8 100644
|
|
--- a/odb/details/shared-ptr/base.hxx
|
|
+++ b/odb/details/shared-ptr/base.hxx
|
|
@@ -35,10 +35,10 @@ namespace odb
|
|
}
|
|
|
|
LIBODB_EXPORT void*
|
|
-operator new (std::size_t, odb::details::share) throw (std::bad_alloc);
|
|
+operator new (std::size_t, odb::details::share);
|
|
|
|
LIBODB_EXPORT void
|
|
-operator delete (void*, odb::details::share) throw ();
|
|
+operator delete (void*, odb::details::share);
|
|
|
|
namespace odb
|
|
{
|
|
@@ -62,16 +62,16 @@ namespace odb
|
|
_ref_count () const;
|
|
|
|
void*
|
|
- operator new (std::size_t) throw (std::bad_alloc);
|
|
+ operator new (std::size_t);
|
|
|
|
void*
|
|
- operator new (std::size_t, share) throw (std::bad_alloc);
|
|
+ operator new (std::size_t, share);
|
|
|
|
void
|
|
- operator delete (void*, share) throw ();
|
|
+ operator delete (void*, share);
|
|
|
|
void
|
|
- operator delete (void*) throw ();
|
|
+ operator delete (void*);
|
|
|
|
struct refcount_callback
|
|
{
|
|
diff --git a/odb/details/shared-ptr/base.ixx b/odb/details/shared-ptr/base.ixx
|
|
index 9bf7c94..e03ea86 100644
|
|
--- a/odb/details/shared-ptr/base.ixx
|
|
+++ b/odb/details/shared-ptr/base.ixx
|
|
@@ -64,25 +64,25 @@ namespace odb
|
|
}
|
|
|
|
inline void* shared_base::
|
|
- operator new (std::size_t n) throw (std::bad_alloc)
|
|
+ operator new (std::size_t n)
|
|
{
|
|
return ::operator new (n);
|
|
}
|
|
|
|
inline void* shared_base::
|
|
- operator new (std::size_t n, share) throw (std::bad_alloc)
|
|
+ operator new (std::size_t n, share)
|
|
{
|
|
return ::operator new (n);
|
|
}
|
|
|
|
inline void shared_base::
|
|
- operator delete (void* p, share) throw ()
|
|
+ operator delete (void* p, share)
|
|
{
|
|
::operator delete (p);
|
|
}
|
|
|
|
inline void shared_base::
|
|
- operator delete (void* p) throw ()
|
|
+ operator delete (void* p)
|
|
{
|
|
::operator delete (p);
|
|
}
|