Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

639f540d

Commit 639f540d authored 5 years ago by Martin Killenberg

Downloads
- Plain Diff

Merge branch 'master' into wip_mhier_initialValuePropagation

- resolved merge conflits
- compiles but some tests are failing

parents 21c2adda 8aec50d5

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 0 deletions

CMakeLists.txt
include/DeviceModule.h 16 additions, 0 deletions

include/DeviceModule.h
include/ExceptionHandlingDecorator.h 10 additions, 3 deletions

include/ExceptionHandlingDecorator.h
src/Application.cc 8 additions, 1 deletion

src/Application.cc
src/DeviceModule.cc 14 additions, 3 deletions

src/DeviceModule.cc
src/ExceptionHandlingDecorator.cc 53 additions, 15 deletions

src/ExceptionHandlingDecorator.cc
tests/executables_src/testExceptionDummyDevice.cc 56 additions, 0 deletions

tests/executables_src/testExceptionDummyDevice.cc
tests/executables_src/testProcessVariableRecovery.cc 215 additions, 0 deletions

tests/executables_src/testProcessVariableRecovery.cc
tests/include/ExceptionDevice.h 8 additions, 1 deletion

tests/include/ExceptionDevice.h
tests/test.map 1 addition, 0 deletions

tests/test.map
tests/test5.map 13 additions, 0 deletions

tests/test5.map

with 395 additions and 23 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

imprint | privacy | Conditions of Use