Skip to content
Snippets Groups Projects
Commit d235a778 authored by florian's avatar florian
Browse files

Merge branch 'f-files' into f-extended-c

parents 33f388f6 3be726bb
No related branches found
No related tags found
1 merge request!8ENH: Add retrieval and queries to Extern C interface
Pipeline #12135 passed
Pipeline: caosdb-cppinttest

#12139

    ......@@ -38,6 +38,7 @@ set(CMAKE_C_EXTENSIONS OFF)
    set(CMAKE_C_STANDARD_REQUIRED ON)
    set(CMAKE_CXX_EXTENSIONS OFF)
    set(CMAKE_CXX_STANDARD_REQUIRED ON)
    set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
    set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
    ......
    ......@@ -77,7 +77,8 @@ std::size_t FileReader::read(std::string &buffer) {
    if (!stream_.eof()) {
    auto bufferSize = buffer.size();
    if (bufferSize > 0) {
    if (!stream_.read(&buffer[0], bufferSize)) {
    // TODO(henrik): fix nolint
    if (!stream_.read(&buffer[0], bufferSize)) { // NOLINT
    throw FileIOError("Can't read file: " + filename_.string());
    }
    ......
    ......@@ -68,7 +68,8 @@ void FileWriter::openFile() {
    void FileWriter::write(const std::string &buffer) {
    auto bufferSize = buffer.size();
    if (bufferSize > 0) {
    if (!stream_.write(buffer.data(), bufferSize)) {
    // TODO(henrik): fix nolint
    if (!stream_.write(buffer.data(), bufferSize)) { // NOLINT
    throw FileIOError("Can't write file: " + filename_.string());
    }
    }
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment