Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
atlas
athena
Merge requests
!47688
Sweeping
!47656
from master to 21.2. AsgServices: Use std::nullptr_t for gcc11
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Sweeping
!47656
from master to 21.2. AsgServices: Use std::nullptr_t for gcc11
cherry-pick-a7b56918099-21.2
into
21.2
Overview
7
Commits
1
Pipelines
2
Changes
1
Merged
Atlas Nightlybuild
requested to merge
cherry-pick-a7b56918099-21.2
into
21.2
3 years ago
Overview
7
Commits
1
Pipelines
2
Changes
1
Expand
AsgServices: Use std::nullptr_t for gcc11
See merge request
!47656 (merged)
0
0
Merge request reports
Compare
21.2
21.2 (base)
and
latest version
latest version
2ebcb9fc
1 commit,
3 years ago
1 file
+
1
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Control/AthToolSupport/AsgServices/AsgServices/IAsgService.h
+
1
−
1
Options
@@ -21,7 +21,7 @@
/// followed by a semicolon, so we need a statement that requires to
/// be followed by a semi-colon.
#define DeclareInterfaceID(iface, major, minor) \
static constexpr nullptr_t interfaceID = nullptr
static constexpr
std::
nullptr_t interfaceID = nullptr
#endif
namespace
asg
Loading