From d50cde11636d921bcb39bee98c9b9ae4254810c5 Mon Sep 17 00:00:00 2001
From: Matthias <github@mpuchner.de>
Date: Wed, 2 Dec 2020 20:57:59 +0100
Subject: [PATCH] clang-format; Linux compilation
---
Device/Histo/IntensityDataIOFactory.cpp | 8 ++++----
Device/Histo/IntensityDataIOFactory.h | 11 ++++++-----
Device/InputOutput/OutputDataReadWriteINT.cpp | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Device/Histo/IntensityDataIOFactory.cpp b/Device/Histo/IntensityDataIOFactory.cpp
index 7cb0d7ac54a..0694e2a1aa2 100644
--- a/Device/Histo/IntensityDataIOFactory.cpp
+++ b/Device/Histo/IntensityDataIOFactory.cpp
@@ -48,8 +48,8 @@ OutputData<double>* IntensityDataIOFactory::readOutputData(const std::string& fi
// Try to read ASCII by default. Binary maps to ASCII.
// If the file is not actually a matrix of numbers,
// the error will be thrown during the reading.
- return readOutputData(file_name,
- [](std::istream& s) { return OutputDataReadWriteNumpyTXT().readOutputData(s); });
+ return readOutputData(
+ file_name, [](std::istream& s) { return OutputDataReadWriteNumpyTXT().readOutputData(s); });
}
OutputData<double>* IntensityDataIOFactory::readReflectometryData(const std::string& file_name) {
@@ -93,7 +93,7 @@ void IntensityDataIOFactory::writeOutputData(const std::string& file_name,
#ifdef _WIN32
fout.open(FileSystemUtils::convert_utf8_to_utf16(file_name), openmode);
#else
- fout.open(m_file_name, openmode);
+ fout.open(file_name, openmode);
#endif
if (!fout.is_open())
@@ -146,7 +146,7 @@ IntensityDataIOFactory::readOutputData(const std::string& file_name,
#ifdef _WIN32
input_stream.open(FileSystemUtils::convert_utf8_to_utf16(file_name), openmode);
#else
- fin.open(m_file_name, openmode);
+ input_stream.open(file_name, openmode);
#endif
if (!input_stream.is_open())
diff --git a/Device/Histo/IntensityDataIOFactory.h b/Device/Histo/IntensityDataIOFactory.h
index 1c72aaf86bf..5b1f71374f4 100644
--- a/Device/Histo/IntensityDataIOFactory.h
+++ b/Device/Histo/IntensityDataIOFactory.h
@@ -63,11 +63,12 @@ public:
static void writeSimulationResult(const SimulationResult& result, const std::string& file_name);
private:
- static OutputData<double>* readOutputData(const std::string& file_name,
- std::function<OutputData<double>* (std::istream&)> readData);
-
- static void writeOutputData(const std::string& file_name,
- std::function<void(std::ostream&)> writeData);
+ static OutputData<double>*
+ readOutputData(const std::string& file_name,
+ std::function<OutputData<double>*(std::istream&)> readData);
+
+ static void writeOutputData(const std::string& file_name,
+ std::function<void(std::ostream&)> writeData);
};
#endif // BORNAGAIN_DEVICE_HISTO_INTENSITYDATAIOFACTORY_H
diff --git a/Device/InputOutput/OutputDataReadWriteINT.cpp b/Device/InputOutput/OutputDataReadWriteINT.cpp
index 9fa75e8d030..09ddb0bd8fd 100644
--- a/Device/InputOutput/OutputDataReadWriteINT.cpp
+++ b/Device/InputOutput/OutputDataReadWriteINT.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "Device/InputOutput/OutputDataReadWriteINT.h"
-#include "Device/InputOutput/DataFormatUtils.h"
#include "Base/Utils/StringUtils.h"
+#include "Device/InputOutput/DataFormatUtils.h"
#include "Device/Intensity/ArrayUtils.h"
namespace {
--
GitLab