From db887dfbc03d371fd9136c9d2c11c95464b26968 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 16 Jul 2020 11:13:00 +0200
Subject: [PATCH] clang
---
readLib/corsika_data/Interface.h | 12 +++++-----
readLib/source/Interface.boost.cc | 22 ++++++++---------
readLib/source/Interface.dummy.cc | 40 ++++++++++++++++++-------------
readLib/source/testData.cc | 6 ++---
4 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/readLib/corsika_data/Interface.h b/readLib/corsika_data/Interface.h
index 0e902fd..8ed4d1f 100644
--- a/readLib/corsika_data/Interface.h
+++ b/readLib/corsika_data/Interface.h
@@ -26,11 +26,11 @@ namespace corsika_data {
// the fortran interface functions
extern "C" {
- void cordataopenfile_(const char*);
- void cordatafillarray_(double*, const int&);
- void cordataclosefile_();
- double cordatanextnumber_();
- void cordatanexttext_(char*, int);
- void cordatacandecompress_(int&);
+ void cordataopenfile_(const char*);
+ void cordatafillarray_(double*, const int&);
+ void cordataclosefile_();
+ double cordatanextnumber_();
+ void cordatanexttext_(char*, int);
+ void cordatacandecompress_(int&);
}
} // namespace corsika_data
diff --git a/readLib/source/Interface.boost.cc b/readLib/source/Interface.boost.cc
index f1195ff..ba27394 100644
--- a/readLib/source/Interface.boost.cc
+++ b/readLib/source/Interface.boost.cc
@@ -72,17 +72,17 @@ namespace corsika_data {
for (int i = 0; i < maxlength && i < (int)STR.size(); ++i) data[i] = STR[i];
}
bool CorDataCanDeCompress() { return true; }
-
+
extern "C" {
- void cordataopenfile_(const char* name) { CorDataOpenFile(name); }
- void cordatafillarray_(double* data, const int& length) {
- global_DataFile.FillArray(data, length);
- }
- double cordatanextnumber_() { return global_DataFile.ReadNextNumber(); }
- void cordatanexttext_(char* data, const int maxlength) {
- return CorDataNextText(data, maxlength);
- }
- void cordataclosefile_() { global_DataFile.Close(); }
- void cordatacandecompress_(int& v) { v=1; }
+ void cordataopenfile_(const char* name) { CorDataOpenFile(name); }
+ void cordatafillarray_(double* data, const int& length) {
+ global_DataFile.FillArray(data, length);
+ }
+ double cordatanextnumber_() { return global_DataFile.ReadNextNumber(); }
+ void cordatanexttext_(char* data, const int maxlength) {
+ return CorDataNextText(data, maxlength);
+ }
+ void cordataclosefile_() { global_DataFile.Close(); }
+ void cordatacandecompress_(int& v) { v = 1; }
}
} // namespace corsika_data
diff --git a/readLib/source/Interface.dummy.cc b/readLib/source/Interface.dummy.cc
index 527a0e1..29a7552 100644
--- a/readLib/source/Interface.dummy.cc
+++ b/readLib/source/Interface.dummy.cc
@@ -14,37 +14,45 @@
namespace corsika_data {
void CorDataOpenFile(const std::string&) {
- throw std::runtime_error("CorDataOpenFile: Cannot read compressed data files with dummy library.");
+ throw std::runtime_error(
+ "CorDataOpenFile: Cannot read compressed data files with dummy library.");
}
void CorDataFillArray(double*, const int&) {
- throw std::runtime_error("CorDataFillArray: Cannot read compressed data files with dummy library.");
+ throw std::runtime_error(
+ "CorDataFillArray: Cannot read compressed data files with dummy library.");
}
void CorDataCloseFile() {
- throw std::runtime_error("CorDataCloseFile: Cannot read compressed data files with dummy library.");
+ throw std::runtime_error(
+ "CorDataCloseFile: Cannot read compressed data files with dummy library.");
}
double CorDataNextNumber() {
- throw std::runtime_error("CorDataNextNumber: Cannot read compressed data files with dummy library.");
+ throw std::runtime_error(
+ "CorDataNextNumber: Cannot read compressed data files with dummy library.");
return 0;
}
void CorDataNextText(std::string&) {
- throw std::runtime_error("CorDataNextText(string&): Cannot read compressed data files with dummy library.");
+ throw std::runtime_error(
+ "CorDataNextText(string&): Cannot read compressed data files with dummy "
+ "library.");
}
void CorDataNextText(char*, int) {
- throw std::runtime_error("CorDataNextText(char*): Cannot read compressed data files with dummy library.");
+ throw std::runtime_error(
+ "CorDataNextText(char*): Cannot read compressed data files with dummy library.");
}
bool CorDataCanDeCompress() { return false; }
// the fortran interface functions
extern "C" {
- void cordataopenfile_(const char* name) { CorDataOpenFile(name); }
- void cordatafillarray_(double* data, const int& length) {
- CorDataFillArray(data, length);
- }
- void cordataclosefile_() { CorDataCloseFile(); }
- double cordatanextnumber_() { return CorDataNextNumber(); }
- void cordatanexttext_(char*, int) {
- throw std::runtime_error("cordatanexttext_: Cannot read compressed data files with dummy library.");
- }
- void cordatacandecompress_(int& v) { v=0; }
+ void cordataopenfile_(const char* name) { CorDataOpenFile(name); }
+ void cordatafillarray_(double* data, const int& length) {
+ CorDataFillArray(data, length);
+ }
+ void cordataclosefile_() { CorDataCloseFile(); }
+ double cordatanextnumber_() { return CorDataNextNumber(); }
+ void cordatanexttext_(char*, int) {
+ throw std::runtime_error(
+ "cordatanexttext_: Cannot read compressed data files with dummy library.");
+ }
+ void cordatacandecompress_(int& v) { v = 0; }
}
} // namespace corsika_data
diff --git a/readLib/source/testData.cc b/readLib/source/testData.cc
index 95af686..5037378 100644
--- a/readLib/source/testData.cc
+++ b/readLib/source/testData.cc
@@ -60,7 +60,7 @@ TEST_CASE("Data", "[data]") {
}
SECTION(std::string("fortran, ") + file) {
- int i=0;
+ int i = 0;
cordatacandecompress_(i);
CHECK(i == 1);
cout << "Reading: " << file << endl;
@@ -108,9 +108,9 @@ TEST_CASE("Data", "[data]") {
CHECK_THROWS(d = cordatanextnumber_());
char* buf = 0;
CHECK_THROWS(cordatanexttext_(buf, 0));
- int i= 0;
+ int i = 0;
cordatacandecompress_(i);
- CHECK( i == 0);
+ CHECK(i == 0);
}
#endif
--
GitLab