From 3d0ca5cab28cc1c0159e30208b2f64c00e8ec0ac Mon Sep 17 00:00:00 2001
From: wgodoy <wgodoy@william-laptop>
Date: Thu, 2 Feb 2017 20:07:54 -0500
Subject: [PATCH] Fixed bugs in BP1Writer, Transport.h and hello dataman
Makefile
Prevented from compiling and running hello examples
Makefile in dataman needed to link with libpthread -lpthread
---
examples/hello/dataman/Makefile | 4 ++--
include/core/Transport.h | 5 -----
src/format/BP1Writer.cpp | 4 ++--
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/examples/hello/dataman/Makefile b/examples/hello/dataman/Makefile
index 16893cb71..a256c502b 100644
--- a/examples/hello/dataman/Makefile
+++ b/examples/hello/dataman/Makefile
@@ -24,10 +24,10 @@ CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11
all: mpi
mpi: $(ADIOS_LIB) $(ADIOS_HFiles)
- $(MPICC) $(CFLAGS) $(ADIOS_INCLUDE) -DHAVE_MPI $(BASE_NAME).cpp -o $(BASE_NAME)_mpi $(ADIOS_LIB)
+ $(MPICC) $(CFLAGS) $(ADIOS_INCLUDE) -DHAVE_MPI $(BASE_NAME).cpp -o $(BASE_NAME)_mpi $(ADIOS_LIB) -lpthread
nompi: $(ADIOS_NOMPI_LIB) $(NoMPI_HFiles)
- $(CC) $(CFLAGS) $(ADIOS_INCLUDE) $(BASE_NAME).cpp -o $(BASE_NAME)_nompi $(ADIOS_NOMPI_LIB)
+ $(CC) $(CFLAGS) $(ADIOS_INCLUDE) $(BASE_NAME).cpp -o $(BASE_NAME)_nompi $(ADIOS_NOMPI_LIB) -lpthread
clean:
rm *_mpi; rm *_nompi
diff --git a/include/core/Transport.h b/include/core/Transport.h
index 414d65aa2..781180699 100644
--- a/include/core/Transport.h
+++ b/include/core/Transport.h
@@ -83,11 +83,6 @@ public:
protected:
const bool m_DebugMode = false; ///< if true: additional checks and exceptions
- /**
- * Initialize particular derived transport class members
- * @param arguments particular transport arguments
- */
- virtual void Init( const std::vector<std::string>& arguments );
};
diff --git a/src/format/BP1Writer.cpp b/src/format/BP1Writer.cpp
index 57bbd331b..55449a49d 100644
--- a/src/format/BP1Writer.cpp
+++ b/src/format/BP1Writer.cpp
@@ -34,8 +34,8 @@ void BP1Writer::Close( const BP1MetadataSet& metadataSet, Capsule& capsule, Tran
}
//PRIVATE FUNCTIONS
-void WriteNameRecord( const std::string& name, const std::uint16_t& length,
- std::vector<char*>& buffers, std::vector<std::size_t>& positions )
+void BP1Writer::WriteNameRecord( const std::string& name, const std::uint16_t& length,
+ std::vector<char*>& buffers, std::vector<std::size_t>& positions )
{
MemcpyToBuffers( buffers, positions, &length, 2 );
MemcpyToBuffers( buffers, positions, name.c_str( ), length );
--
GitLab