From 0fd611842f504b8c0ac73a91c69f6b6b7fdba78b Mon Sep 17 00:00:00 2001
From: williamfgc <williamfgc@yahoo.com>
Date: Thu, 20 Apr 2017 18:12:24 -0400
Subject: [PATCH] Corrected bugs and clang-format issues
Updated adiosFunctions.cpp
Corrected warnings, missing return and signature in ResizeBuffer
---
source/adios2/core/adiosFunctions.cpp | 12 +++++-------
source/adios2/utilities/format/bp1/BP1Base.cpp | 2 --
source/adios2/utilities/format/bp1/BP1Writer.h | 2 +-
source/adios2/utilities/format/bp1/BP1Writer.tcc | 2 ++
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/source/adios2/core/adiosFunctions.cpp b/source/adios2/core/adiosFunctions.cpp
index c1caea095..3c88bef79 100644
--- a/source/adios2/core/adiosFunctions.cpp
+++ b/source/adios2/core/adiosFunctions.cpp
@@ -9,25 +9,23 @@
*/
#include "adiosFunctions.h"
-
+/// \cond EXCLUDE_FROM_DOXYGEN
#include <sys/stat.h> //stat
#include <sys/types.h> //CreateDirectory
#include <unistd.h> //CreateDirectory
-#include <cmath> // std::ceil, std::pow, std::log
-#include <cstring> //std::memcpy
-
#include <algorithm> //std::count
+#include <cmath> // std::ceil, std::pow, std::log
+#include <cstring> //std::memcpy
#include <fstream>
#include <ios> //std::ios_base::failure
#include <sstream>
#include <stdexcept>
#include <thread> //std::thread
+/// \endcond
-
-#include "adios2/ADIOSTypes.h"
#include "adios2/ADIOSMPI.h"
-
+#include "adios2/ADIOSTypes.h"
#include "adios2/core/Support.h"
#ifdef ADIOS2_HAVE_BZIP2
diff --git a/source/adios2/utilities/format/bp1/BP1Base.cpp b/source/adios2/utilities/format/bp1/BP1Base.cpp
index a108edd7d..43b1d293b 100644
--- a/source/adios2/utilities/format/bp1/BP1Base.cpp
+++ b/source/adios2/utilities/format/bp1/BP1Base.cpp
@@ -10,10 +10,8 @@
#include "BP1Base.h"
-
#include "adios2/core/adiosFunctions.h" //CreateDirectory
-
namespace adios
{
namespace format
diff --git a/source/adios2/utilities/format/bp1/BP1Writer.h b/source/adios2/utilities/format/bp1/BP1Writer.h
index 821217336..b3bd946fc 100644
--- a/source/adios2/utilities/format/bp1/BP1Writer.h
+++ b/source/adios2/utilities/format/bp1/BP1Writer.h
@@ -277,7 +277,7 @@ private:
#define declare_template_instantiation(T) \
extern template BP1Writer::ResizeResult BP1Writer::ResizeBuffer( \
- const Variable<T> &variable) noexcept; \
+ const Variable<T> &variable); \
\
extern template void BP1Writer::WriteVariablePayload( \
const Variable<T> &variable) noexcept; \
diff --git a/source/adios2/utilities/format/bp1/BP1Writer.tcc b/source/adios2/utilities/format/bp1/BP1Writer.tcc
index 50facc41a..170f82bcc 100644
--- a/source/adios2/utilities/format/bp1/BP1Writer.tcc
+++ b/source/adios2/utilities/format/bp1/BP1Writer.tcc
@@ -33,6 +33,8 @@ BP1Writer::ResizeResult BP1Writer::ResizeBuffer(const Variable<T> &variable)
return ResizeResult::FLUSH;
}
}
+
+ return ResizeResult::SUCCESS;
}
template <class T>
--
GitLab