fixed merge problems

3 jobs for master in 37 seconds (queued for 9 seconds)
Status Name Job ID Coverage
  Test
failed test_address #116476
shared-fi

00:00:36

failed test_bare #116475
shared-fi

00:00:35

failed test_undefined #116477
shared-fi

00:00:36

 
Name Stage Failure
failed
test_undefined Test
[ 73%] Built target static_circular_buffer_test
make[3]: Leaving directory '/builds/xkoniar/emlabcpp/build'
[ 73%] Built target either_test
make[2]: Leaving directory '/builds/xkoniar/emlabcpp/build'
make[1]: Leaving directory '/builds/xkoniar/emlabcpp/build'
make[1]: *** [Makefile:95: all] Error 2
make: *** [Makefile:19: build_test] Error 2
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
test_address Test
[ 73%] Built target either_test
make[3]: Leaving directory '/builds/xkoniar/emlabcpp/build'
[ 73%] Built target physical_quantity_test
make[2]: Leaving directory '/builds/xkoniar/emlabcpp/build'
make[1]: *** [Makefile:95: all] Error 2
make[1]: Leaving directory '/builds/xkoniar/emlabcpp/build'
make: *** [Makefile:19: build_test] Error 2
Cleaning up file based variables
ERROR: Job failed: exit code 1
failed
test_bare Test
[ 80%] Built target either_test
make[3]: Leaving directory '/builds/xkoniar/emlabcpp/build'
[ 80%] Built target static_circular_buffer_test
make[2]: Leaving directory '/builds/xkoniar/emlabcpp/build'
make[1]: Leaving directory '/builds/xkoniar/emlabcpp/build'
make[1]: *** [Makefile:95: all] Error 2
make: *** [Makefile:19: build_test] Error 2
Cleaning up file based variables
ERROR: Job failed: exit code 1