Merge branch 'master' of https://github.com/ornladios/ADIOS2.git (3b593642) · Commits · Podhorszki, Norbert / ADIOS2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ADIOS2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3b593642

Commit 3b593642 authored 7 years ago by wfg

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/ornladios/ADIOS2.git

Conflicts:
	include/engine/bp/BPFileWriter.h
	source/core/Engine.cpp
	source/engine/bp/BPFileWriter.cpp

parents 0554b01f 43fdd856

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/core/Transport.h 2 additions, 3 deletions

include/core/Transport.h
include/engine/bp/BPFileWriter.h 1 addition, 1 deletion

include/engine/bp/BPFileWriter.h
include/utilities/profiling/iochrono/Timer.h 0 additions, 4 deletions

include/utilities/profiling/iochrono/Timer.h
scripts/developer/setup.sh 1 addition, 1 deletion

scripts/developer/setup.sh
source/core/Engine.cpp 81 additions, 32 deletions

source/core/Engine.cpp
source/core/Transport.cpp 3 additions, 2 deletions

source/core/Transport.cpp
source/engine/bp/BPFileWriter.cpp 5 additions, 4 deletions

source/engine/bp/BPFileWriter.cpp
source/transport/file/FStream.cpp 1 addition, 1 deletion

source/transport/file/FStream.cpp

with 94 additions and 48 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