Conflicts:
	examples/heatTransfer/IO_adios2.cpp
	examples/hello/bpWriter/helloBPWriter.cpp
	examples/hello/bpWriter/helloBPWriter_nompi.cpp
	include/ADIOS.h
	include/capsule/heap/STLVector.h
	include/core/Capsule.h
	include/core/Engine.h
	include/core/Method.h
	include/core/Profiler.h
	include/core/Transport.h
	include/engine/bp/BPFileReader.h
	include/engine/bp/BPFileWriter.h
	include/engine/dataman/DataManReader.h
	include/engine/dataman/DataManWriter.h
	include/format/BP1.h
	include/format/BP1Aggregator.h
	include/format/BP1Writer.h
	source/ADIOS.cpp
	source/core/Engine.cpp
	source/core/Method.cpp
	source/core/Transport.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp
	source/format/BP1Aggregator.cpp
	source/format/BP1Writer.cpp
	source/transport/file/FileDescriptor.cpp

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

Move from indent width from 2 -> 4

Fixed
Conflicts:
	include/engine/bp/BPFileReader.h
	source/core/Transport.cpp
	source/engine/bp/BPFileReader.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp     ---> Removed
	source/format/BP1Aggregator.cpp ---> Removed
	source/format/BP1Writer.cpp ---> Removed
	source/transport/file/FileDescriptor.cpp

Disable clang-format hooks.  It's more annoying than useful.

Fix gcc485 segfault

Using {} syntax for direct initialization of reference types in constructor
member initialization lists is broken on some compilers, even though it's valid
C++11 code.  Use () to ensure correctness.

added: 
./packages/format/bp1
./packages/profiling/iochrono
./packages/wan/dataman (for DataMan integration in ADIOS)

Add examples as tests

Fix OpenMPi C++ binding issue for the whole project

Fix clang tidy issues round2

Fix clang tidy errors

Testing pull request with additions to .gitignore

The check is to use int64_t instead of long long.  At the moment it creates
a lot of noise.  Adjusting the code is a larger undertaking so I'm turning it
off for now.  Once the code is fixed for it then we'll turn it back on.

Let DataMan_ROOT_DIR be specified by either a CMake or Env variable

OpenMPI workaround for forcing C++ binding