Merge pull request #11 from eth-cscs/master (7634f0f6) · Commits · arbor-sim / arbor · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

arbor
- Activity
- Members
- Releases
- Contributor analytics
- Repository analytics

Snippets Groups Projects

7634f0f6

Commit 7634f0f6 authored 8 years ago by

Ben Cumming Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #11 from eth-cscs/master

merge master into my fork

parents 205e8982 c814c106

No related branches found

No related tags found

No related merge requests found

Changes 113

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/model.hpp 263 additions, 0 deletions

src/model.hpp
src/profiling/profiler.cpp 45 additions, 12 deletions

src/profiling/profiler.cpp
src/profiling/profiler.hpp 20 additions, 2 deletions

src/profiling/profiler.hpp
src/recipe.hpp 54 additions, 0 deletions

src/recipe.hpp
src/segment.hpp 28 additions, 31 deletions

src/segment.hpp
src/spike.hpp 11 additions, 20 deletions

src/spike.hpp
src/spike_source.hpp 13 additions, 13 deletions

src/spike_source.hpp
src/stimulus.hpp 3 additions, 3 deletions

src/stimulus.hpp
src/swcio.cpp 1 addition, 1 deletion

src/swcio.cpp
src/thread_private_spike_store.hpp 87 additions, 0 deletions

src/thread_private_spike_store.hpp
src/threading/serial.hpp 58 additions, 5 deletions

src/threading/serial.hpp
src/threading/tbb.hpp 20 additions, 0 deletions

src/threading/tbb.hpp
src/tree.hpp 45 additions, 42 deletions

src/tree.hpp
src/util.hpp 2 additions, 2 deletions

src/util.hpp
src/util/counter.hpp 95 additions, 0 deletions

src/util/counter.hpp
src/util/debug.cpp 12 additions, 4 deletions

src/util/debug.cpp
src/util/debug.hpp 13 additions, 3 deletions

src/util/debug.hpp
src/util/double_buffer.hpp 66 additions, 0 deletions

src/util/double_buffer.hpp
src/util/either.hpp 387 additions, 0 deletions

src/util/either.hpp
src/util/ioutil.hpp 70 additions, 1 deletion

src/util/ioutil.hpp

with 1293 additions and 139 deletions

0% 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