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

Merge branch 'dev' into f-insert

parents f91e5a0f 1e8ceeb2
No related branches found
No related tags found
1 merge request!4ENH: Allow insertion and deletion of single entities
Pipeline #11110 passed
Pipeline: caosdb-cppinttest

#11112

    This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
    Makefile 0 → 100644
    # ** header v3.0
    # This file is a part of the CaosDB Project.
    #
    # Copyright (C) 2021 IndiScale GmbH <info@indiscale.com>
    # Copyright (C) 2021 Daniel Hornung <d.hornung@indiscale.com>
    #
    # This program is free software: you can redistribute it and/or modify
    # it under the terms of the GNU Affero General Public License as
    # published by the Free Software Foundation, either version 3 of the
    # License, or (at your option) any later version.
    #
    # This program is distributed in the hope that it will be useful,
    # but WITHOUT ANY WARRANTY; without even the implied warranty of
    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    # GNU Affero General Public License for more details.
    #
    # You should have received a copy of the GNU Affero General Public License
    # along with this program. If not, see <https://www.gnu.org/licenses/>.
    #
    # ** end header
    # This Makefile is a wrapper for several other scripts.
    CLANG-FORMAT = clang-format-11
    .PHONY: help
    help:
    @echo "Targets:"
    @echo " conan-install - Install locally with Conan."
    @echo " style - auto-format the source files."
    style:
    $(CLANG-FORMAT) -i --verbose \
    $$(find test/ src/ include/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in")
    .PHONY: style
    conan-install:
    conan create . -s "compiler.libcxx=libstdc++11"
    .PHONY: install
    ......@@ -22,6 +22,8 @@
    #ifndef CAOSDB_STATUS_CODE_H
    #define CAOSDB_STATUS_CODE_H
    #include <string>
    /**
    * StatusCodes represent the status of this client, it's connections,
    * configuration and so on.
    ......
    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