Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

6ce66362

Commit 6ce66362 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'bug/163/garbage' into 'master'

Resolves #163 garbage segfault

Closes #163

See merge request nicolas.pope/ftl!100

parents 0b76aafe 4828bbd9

No related branches found

No related tags found

1 merge request!100Resolves #163 garbage segfault

Pipeline #13098 passed 5 years ago

Stage: all

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

components/common/cpp/include/ftl/threads.hpp 1 addition, 1 deletion

components/common/cpp/include/ftl/threads.hpp
components/net/cpp/src/dispatcher.cpp 3 additions, 3 deletions

components/net/cpp/src/dispatcher.cpp
components/net/cpp/src/peer.cpp 3 additions, 4 deletions

components/net/cpp/src/peer.cpp
components/net/cpp/src/universe.cpp 19 additions, 12 deletions

components/net/cpp/src/universe.cpp

with 26 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment