Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
senf
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Show more breadcrumbs
wiback
senf
Commits
82922002
Commit
82922002
authored
16 years ago
by
g0dil
Browse files
Options
Downloads
Patches
Plain Diff
PPI: Fix boost compatibility issues
parent
d211a431
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
PPI/AnnotationRouter.ct
+14
-1
14 additions, 1 deletion
PPI/AnnotationRouter.ct
include/senf/Console
+1
-1
1 addition, 1 deletion
include/senf/Console
with
15 additions
and
2 deletions
PPI/AnnotationRouter.ct
+
14
−
1
View file @
82922002
...
...
@@ -45,8 +45,16 @@ senf::ppi::module::AnnotationRouter<AnnotationType>::newOutput(AnnotationType co
if (outputs_.find(key) != outputs_.end())
throw DuplicateKeyException(key);
// key must not be const ... has something to do with exception guarantees ??
// From boost 1.34.0 on we can use auto_ptr which we really should for exception safety
// but this doesn't work with boost 1.33.1 :-(
#if BOOST_VERSION >= 103400
return *outputs_.insert(key,
std::auto_ptr<connector::ActiveOutput<> >(
new connector::ActiveOutput<>())).first->second;
#else
AnnotationType k (key);
return *outputs_.insert(k, new connector::ActiveOutput<>()).first;
#endif
}
template <class AnnotationType>
...
...
@@ -56,8 +64,13 @@ prefix_ void senf::ppi::module::AnnotationRouter<AnnotationType>::request()
typename Outputs::iterator i (outputs_.find(p.annotation<AnnotationType>()));
if (i == outputs_.end())
defaultOutput(p);
else
else {
#if BOOST_VERSION >= 103400
(*i->second)(p);
#else
(*i)(p);
#endif
}
}
///////////////////////////////ct.e////////////////////////////////////////
...
...
This diff is collapsed.
Click to expand it.
include/senf/Console
+
1
−
1
View file @
82922002
../../Console
\ No newline at end of file
../../Scheduler/Console
\ No newline at end of file
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