Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Root
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
为了安全,强烈建议开启2FA双因子认证:User Settings -> Account -> Enable two-factor authentication!!!
Show more breadcrumbs
cxwx
Root
Commits
9bed536a
Commit
9bed536a
authored
8 years ago
by
Axel Naumann
Browse files
Options
Downloads
Patches
Plain Diff
Fix exception spec for nothrow_t overloads.
parent
91cbbfd2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
core/newdelete/src/NewDelete.cxx
+7
-7
7 additions, 7 deletions
core/newdelete/src/NewDelete.cxx
with
7 additions
and
7 deletions
core/newdelete/src/NewDelete.cxx
+
7
−
7
View file @
9bed536a
...
...
@@ -216,20 +216,20 @@ void *operator new(size_t size) R__THROW_BAD
return
ExtStart
(
vp
);
}
void
*
operator
new
(
size_t
size
,
const
std
::
nothrow_t
&
)
R__THROW_BAD
void
*
operator
new
(
size_t
size
,
const
std
::
nothrow_t
&
)
noexcept
{
return
::
operator
new
(
size
);
}
#if __cplusplus >= 201700L
void
*
operator
new
(
size_t
size
,
std
::
align_val_t
al
)
R__THROW_BAD
void
*
operator
new
(
size_t
size
,
std
::
align_val_t
al
)
{
Fatal
(
"operator new"
,
"with std::align_val_t is not implemented yet"
);
return
nullptr
;
}
void
*
operator
new
(
size_t
size
,
std
::
align_val_t
al
,
const
std
::
nothrow_t
&
)
R__THROW_BAD
void
*
operator
new
(
size_t
size
,
std
::
align_val_t
al
,
const
std
::
nothrow_t
&
)
noexcept
{
Fatal
(
"operator new"
,
"with std::align_val_t is not implemented yet"
);
return
nullptr
;
...
...
@@ -303,7 +303,7 @@ void operator delete(void *ptr) R__THROW_NULL
}
}
void
operator
delete
(
void
*
ptr
,
const
std
::
nothrow_t
&
)
R__THROW_NULL
void
operator
delete
(
void
*
ptr
,
const
std
::
nothrow_t
&
)
noexcept
{
operator
delete
(
ptr
);
}
...
...
@@ -313,7 +313,7 @@ void operator delete(void *ptr, std::align_val_t al) R__THROW_NULL
{
Fatal
(
"operator delete"
,
"with std::align_val_t is not implemented yet"
);
}
void
operator
delete
(
void
*
ptr
,
std
::
align_val_t
al
,
const
std
::
nothrow_t
&
)
R__THROW_NULL
void
operator
delete
(
void
*
ptr
,
std
::
align_val_t
al
,
const
std
::
nothrow_t
&
)
noescept
{
Fatal
(
"operator delete"
,
"with std::align_val_t is not implemented yet"
);
}
...
...
@@ -343,7 +343,7 @@ void *operator new[](size_t size) R__THROW_BAD
return
::
operator
new
(
size
);
}
void
*
operator
new
[](
size_t
size
,
const
std
::
nothrow_t
&
)
R__THROW_BAD
void
*
operator
new
[](
size_t
size
,
const
std
::
nothrow_t
&
)
noexcept
{
return
::
operator
new
(
size
);
}
...
...
@@ -356,7 +356,7 @@ void *operator new[](size_t size, std::align_val_t al) R__THROW_BAD
return
nullptr
;
}
void
*
operator
new
[](
size_t
size
,
std
::
align_val_t
al
,
const
std
::
nothrow_t
&
)
R__THROW_BAD
void
*
operator
new
[](
size_t
size
,
std
::
align_val_t
al
,
const
std
::
nothrow_t
&
)
noexcept
{
Fatal
(
"operator new[]"
,
"with std::align_val_t is not implemented yet"
);
return
nullptr
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment