diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-05 16:48:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 16:48:58 +0100 |
| commit | 398be18e6c5171ae006ba977c111d31ba09bb998 (patch) | |
| tree | 5391d082d839ff76b08def5f89b79cdadb236c6a /TAO | |
| parent | 0e9c1fc176406a9a7562314ed6592ffe9e2a12fb (diff) | |
| parent | ee3e01fbd51a02a2962bdc69b9018a9fdf45dc8c (diff) | |
| download | ATCD-398be18e6c5171ae006ba977c111d31ba09bb998.tar.gz | |
Merge pull request #1381 from jwillemsen/jwi-noexcept
Use noexcept(false) directly in the code
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Storable_File_Guard.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Storable_File_Guard.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp index 114eae51119..51b466aca48 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp @@ -29,7 +29,7 @@ namespace TAO PG_Group_List_Store_File_Guard (PG_Group_List_Store & list_store, Method_Type method_type); - ~PG_Group_List_Store_File_Guard () ACE_NOEXCEPT_FALSE; + ~PG_Group_List_Store_File_Guard () noexcept(false); virtual void set_object_last_changed (const time_t & time); @@ -69,7 +69,7 @@ TAO::PG_Group_List_Store_File_Guard::PG_Group_List_Store_File_Guard ( } } -TAO::PG_Group_List_Store_File_Guard::~PG_Group_List_Store_File_Guard () ACE_NOEXCEPT_FALSE +TAO::PG_Group_List_Store_File_Guard::~PG_Group_List_Store_File_Guard () noexcept(false) { this->release (); if (list_store_.lock_.release() == -1) diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp index b428fe67121..8f595d7de08 100644 --- a/TAO/tao/Storable_File_Guard.cpp +++ b/TAO/tao/Storable_File_Guard.cpp @@ -24,7 +24,7 @@ Storable_File_Guard (bool redundant, bool use_backup) } TAO::Storable_File_Guard:: -~Storable_File_Guard () ACE_NOEXCEPT_FALSE +~Storable_File_Guard () noexcept(false) { delete fl_; } diff --git a/TAO/tao/Storable_File_Guard.h b/TAO/tao/Storable_File_Guard.h index 3bf33299bc1..7f33ba7c681 100644 --- a/TAO/tao/Storable_File_Guard.h +++ b/TAO/tao/Storable_File_Guard.h @@ -34,7 +34,7 @@ namespace TAO Storable_File_Guard (bool redundant, bool use_backup = Storable_Base::use_backup_default); - virtual ~Storable_File_Guard () ACE_NOEXCEPT_FALSE; + virtual ~Storable_File_Guard () noexcept(false); /// Releases the lock, closes the file, and deletes the I/O stream. /// Destructors of derived classes should call this this will |