From 79c67b88f79883a8891107949d02685b7b2ac980 Mon Sep 17 00:00:00 2001 From: enetz Date: Fri, 8 Dec 2023 23:54:11 +0100 Subject: [PATCH] Reverted change without an effect and cleaned up unused code --- src/openms/include/OpenMS/CONCEPT/Constants.h | 5 ----- src/openms/source/FORMAT/CsvFile.cpp | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/openms/include/OpenMS/CONCEPT/Constants.h b/src/openms/include/OpenMS/CONCEPT/Constants.h index a9590915f0e..5912d7d8872 100644 --- a/src/openms/include/OpenMS/CONCEPT/Constants.h +++ b/src/openms/include/OpenMS/CONCEPT/Constants.h @@ -232,11 +232,6 @@ namespace OpenMS */ inline const double CAL_PER_JOULE = (1 / 4.184); - /** Character that indicates a comment line in a CSV file. (Required for CsvFile) - String - */ - inline const std::string COMMENT_CHAR = "#"; - namespace UserParam { /** User parameter name for identifier of concatenated peptides diff --git a/src/openms/source/FORMAT/CsvFile.cpp b/src/openms/source/FORMAT/CsvFile.cpp index a189df3ab73..98079c4546e 100644 --- a/src/openms/source/FORMAT/CsvFile.cpp +++ b/src/openms/source/FORMAT/CsvFile.cpp @@ -7,7 +7,6 @@ // -------------------------------------------------------------------------- #include -#include using namespace std; @@ -63,7 +62,7 @@ namespace OpenMS bool CsvFile::getRow(Size row, StringList& list) { // it is assumed that the value to be cast won't be so large to overflow an ulong int - if (static_cast(row) > static_cast(CsvFile::rowCount()) - 1) + if (static_cast(row) > static_cast(TextFile::buffer_.size()) - 1) { throw Exception::InvalidIterator(__FILE__, __LINE__, OPENMS_PRETTY_FUNCTION); }