From 4702cfe8d388a78111dd8f76a5f3dec724761703 Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Wed, 21 Oct 2020 19:49:56 -0400 Subject: [PATCH] Move from .cpp/.hpp to .cc/.h --- CMakeLists.txt | 4 +- README.md | 4 +- cmake/FindSphinx.cmake | 2 +- conanfile.py | 2 +- docs/CMakeLists.txt | 2 +- docs/Doxyfile.in | 4 +- docs/conf.py | 2 +- docs/index.rst | 2 +- docs/requirements.txt | 2 +- examples/boltzmann1d/CMakeLists.txt | 2 +- .../{boltzmann1d.cpp => boltzmann1d.cc} | 15 +++----- .../{boltzmann1d.hpp => boltzmann1d.h} | 8 ++-- examples/boltzmann2d/CMakeLists.txt | 2 +- .../{boltzmann2d.cpp => boltzmann2d.cc} | 12 +++--- .../{boltzmann2d.hpp => boltzmann2d.h} | 8 ++-- examples/boltzmann3d/CMakeLists.txt | 2 +- .../{boltzmann3d.cpp => boltzmann3d.cc} | 12 +++--- .../{boltzmann3d.hpp => boltzmann3d.h} | 8 ++-- include/kami/{agent.hpp => agent.h} | 33 +++++++++++----- include/kami/{config.hpp.in => config.h.in} | 6 +-- .../kami/data/{collector.hpp => collector.h} | 2 +- include/kami/{domain.hpp => domain.h} | 10 ++--- include/kami/{grid.hpp => grid.h} | 14 +++---- include/kami/{grid1d.hpp => grid1d.h} | 16 ++++---- include/kami/{grid2d.hpp => grid2d.h} | 14 +++---- include/kami/{grid3d.hpp => grid3d.h} | 14 +++---- include/kami/kami.h | 15 ++++++++ include/kami/kami.hpp | 15 -------- include/kami/{model.hpp => model.h} | 10 ++--- include/kami/multigrid1d.h | 27 +++++++++++++ include/kami/multigrid1d.hpp | 27 ------------- include/kami/multigrid2d.h | 27 +++++++++++++ include/kami/multigrid2d.hpp | 27 ------------- .../kami/{multigrid3d.hpp => multigrid3d.h} | 18 ++++----- include/kami/{random.hpp => random.h} | 10 ++--- include/kami/{scheduler.hpp => scheduler.h} | 10 ++--- include/kami/{sequential.hpp => sequential.h} | 14 +++---- include/kami/sologrid1d.h | 26 +++++++++++++ include/kami/sologrid1d.hpp | 26 ------------- include/kami/{sologrid2d.hpp => sologrid2d.h} | 18 ++++----- include/kami/{sologrid3d.hpp => sologrid3d.h} | 18 ++++----- include/kami/{staged.hpp => staged.h} | 14 +++---- src/kami/CMakeLists.txt | 38 +++++++++---------- src/kami/{agent.cpp => agent.cc} | 2 +- src/kami/{grid1d.cpp => grid1d.cc} | 10 ++--- src/kami/{grid2d.cpp => grid2d.cc} | 10 ++--- src/kami/{grid3d.cpp => grid3d.cc} | 10 ++--- src/kami/{kami.cpp => kami.cc} | 4 +- src/kami/{multigrid1d.cpp => multigrid1d.cc} | 12 +++--- src/kami/{multigrid2d.cpp => multigrid2d.cc} | 12 +++--- src/kami/{multigrid3d.cpp => multigrid3d.cc} | 12 +++--- src/kami/{random.cpp => random.cc} | 8 ++-- src/kami/{sequential.cpp => sequential.cc} | 8 ++-- src/kami/{sologrid1d.cpp => sologrid1d.cc} | 12 +++--- src/kami/{sologrid2d.cpp => sologrid2d.cc} | 12 +++--- src/kami/{sologrid3d.cpp => sologrid3d.cc} | 12 +++--- src/kami/{staged.cpp => staged.cc} | 10 ++--- src/kamidata/CMakeLists.txt | 6 +-- src/kamidata/{baz.cpp => baz.cc} | 0 test/CMakeLists.txt | 4 +- ...unit-kami-agent.cpp => unit-kami-agent.cc} | 4 +- ...-kami-agentid.cpp => unit-kami-agentid.cc} | 4 +- 62 files changed, 352 insertions(+), 342 deletions(-) rename examples/boltzmann1d/{boltzmann1d.cpp => boltzmann1d.cc} (96%) rename examples/boltzmann1d/{boltzmann1d.hpp => boltzmann1d.h} (90%) rename examples/boltzmann2d/{boltzmann2d.cpp => boltzmann2d.cc} (97%) rename examples/boltzmann2d/{boltzmann2d.hpp => boltzmann2d.h} (90%) rename examples/boltzmann3d/{boltzmann3d.cpp => boltzmann3d.cc} (97%) rename examples/boltzmann3d/{boltzmann3d.hpp => boltzmann3d.h} (90%) rename include/kami/{agent.hpp => agent.h} (87%) rename include/kami/{config.hpp.in => config.h.in} (87%) rename include/kami/data/{collector.hpp => collector.h} (89%) rename include/kami/{domain.hpp => domain.h} (57%) rename include/kami/{grid.hpp => grid.h} (80%) rename include/kami/{grid1d.hpp => grid1d.h} (93%) rename include/kami/{grid2d.hpp => grid2d.h} (94%) rename include/kami/{grid3d.hpp => grid3d.h} (95%) create mode 100644 include/kami/kami.h delete mode 100644 include/kami/kami.hpp rename include/kami/{model.hpp => model.h} (83%) create mode 100644 include/kami/multigrid1d.h delete mode 100644 include/kami/multigrid1d.hpp create mode 100644 include/kami/multigrid2d.h delete mode 100644 include/kami/multigrid2d.hpp rename include/kami/{multigrid3d.hpp => multigrid3d.h} (51%) rename include/kami/{random.hpp => random.h} (95%) rename include/kami/{scheduler.hpp => scheduler.h} (88%) rename include/kami/{sequential.hpp => sequential.h} (90%) create mode 100644 include/kami/sologrid1d.h delete mode 100644 include/kami/sologrid1d.hpp rename include/kami/{sologrid2d.hpp => sologrid2d.h} (51%) rename include/kami/{sologrid3d.hpp => sologrid3d.h} (51%) rename include/kami/{staged.hpp => staged.h} (91%) rename src/kami/{agent.cpp => agent.cc} (97%) rename src/kami/{grid1d.cpp => grid1d.cc} (96%) rename src/kami/{grid2d.cpp => grid2d.cc} (97%) rename src/kami/{grid3d.cpp => grid3d.cc} (98%) rename src/kami/{kami.cpp => kami.cc} (67%) rename src/kami/{multigrid1d.cpp => multigrid1d.cc} (73%) rename src/kami/{multigrid2d.cpp => multigrid2d.cc} (76%) rename src/kami/{multigrid3d.cpp => multigrid3d.cc} (80%) rename src/kami/{random.cpp => random.cc} (93%) rename src/kami/{sequential.cpp => sequential.cc} (88%) rename src/kami/{sologrid1d.cpp => sologrid1d.cc} (74%) rename src/kami/{sologrid2d.cpp => sologrid2d.cc} (77%) rename src/kami/{sologrid3d.cpp => sologrid3d.cc} (80%) rename src/kami/{staged.cpp => staged.cc} (91%) rename src/kamidata/{baz.cpp => baz.cc} (100%) rename test/{unit-kami-agent.cpp => unit-kami-agent.cc} (94%) rename test/{unit-kami-agentid.cpp => unit-kami-agentid.cc} (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce972af..f9529ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 3.13) # GENERATOR_IS_MULTI_CONFIG set(KAMI_VERSION_MAJOR 0) -set(KAMI_VERSION_MINOR 2) +set(KAMI_VERSION_MINOR 3) set(KAMI_VERSION_PATCH 0) set(KAMI_VERSION_STRING ${KAMI_VERSION_MAJOR}.${KAMI_VERSION_MINOR}.${KAMI_VERSION_PATCH}) @@ -193,4 +193,4 @@ install( "${config_install_dir}" ) -add_subdirectory(docs) \ No newline at end of file +add_subdirectory(docs) diff --git a/README.md b/README.md index 6b9be5e..69a0947 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ git clone https://github.com/k3jph/kami.git cd kami mkdir build && cd build conan install .. -cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/kami -DBUILD_SHARED_LIBS:BOOL=TRUE +cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/kami -DBUILD_SHARED_LIBS:BOOL=FALSE cmake --build . ctest -C Debug cmake --build . --target install @@ -46,4 +46,4 @@ tests. Neither is used directly by the Kami library. ## For more information -* James P. Howard, II <> \ No newline at end of file +* James P. Howard, II <> diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake index 1382309..990f979 100644 --- a/cmake/FindSphinx.cmake +++ b/cmake/FindSphinx.cmake @@ -8,4 +8,4 @@ include(FindPackageHandleStandardArgs) #Handle standard arguments to find_package like REQUIRED and QUIET find_package_handle_standard_args(Sphinx "Failed to find sphinx-build executable" - SPHINX_EXECUTABLE) \ No newline at end of file + SPHINX_EXECUTABLE) diff --git a/conanfile.py b/conanfile.py index 6ca3ed7..b99d7c5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -3,7 +3,7 @@ from conans import ConanFile, CMake class KamiConan(ConanFile): name = "kami" - version = "0.2.0" + version = "0.3.0" author = "James P. Howard, II " url = "http://github.com/GavinNL/cpp_library_template" description = "Agent-Based Modeling in Modern C++" diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 4033584..92de9b7 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -3,7 +3,7 @@ find_package(Sphinx REQUIRED) # Find all the public headers get_target_property(KAMI_PUBLIC_HEADER_DIR kami INTERFACE_INCLUDE_DIRECTORIES) -file(GLOB_RECURSE KAMI_PUBLIC_HEADERS ${KAMI_PUBLIC_HEADER_DIR}/kami/*.hpp) +file(GLOB_RECURSE KAMI_PUBLIC_HEADERS ${KAMI_PUBLIC_HEADER_DIR}/kami/*.h) set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/include/kami) set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 6f664c9..778963b 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -795,9 +795,9 @@ INPUT_ENCODING = UTF-8 # need to set EXTENSION_MAPPING for the extension otherwise the files are not # read by doxygen. # -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# If left blank the following patterns are tested:*.c, *.cc, *.cc, *.cpp, # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.hh, *.h, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, # *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl, # *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js. diff --git a/docs/conf.py b/docs/conf.py index 47c7779..fac218d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -193,4 +193,4 @@ html_theme_options = { # Choose Bootstrap version. # Values: "3" (default) or "2" (in quotes) 'bootstrap_version': "3", -} \ No newline at end of file +} diff --git a/docs/index.rst b/docs/index.rst index 3e26bba..fb97b8f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -8,4 +8,4 @@ Docs :maxdepth: 2 about - api/library_root \ No newline at end of file + api/library_root diff --git a/docs/requirements.txt b/docs/requirements.txt index a71712f..a8ed941 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,2 +1,2 @@ breathe -sphinx \ No newline at end of file +sphinx diff --git a/examples/boltzmann1d/CMakeLists.txt b/examples/boltzmann1d/CMakeLists.txt index cdfbe5d..588ae7a 100644 --- a/examples/boltzmann1d/CMakeLists.txt +++ b/examples/boltzmann1d/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(spdlog) create_executable( NAME ${EXAMPLE_NAME} SOURCES - boltzmann1d.cpp + boltzmann1d.cc PUBLIC_DEFINITIONS USE_DOUBLE_PRECISION=1 PRIVATE_DEFINITIONS diff --git a/examples/boltzmann1d/boltzmann1d.cpp b/examples/boltzmann1d/boltzmann1d.cc similarity index 96% rename from examples/boltzmann1d/boltzmann1d.cpp rename to examples/boltzmann1d/boltzmann1d.cc index 5f5bd4e..c7e183b 100644 --- a/examples/boltzmann1d/boltzmann1d.cpp +++ b/examples/boltzmann1d/boltzmann1d.cc @@ -2,7 +2,7 @@ * TODO FILEHEADER */ -#include "boltzmann1d.hpp" +#include "boltzmann1d.h" #include #include @@ -13,17 +13,14 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -using namespace kami; -using namespace std; - MultiGrid1D *MoneyAgent::world = nullptr; BoltzmannWealthModel *MoneyAgent::model = nullptr; shared_ptr console; diff --git a/examples/boltzmann1d/boltzmann1d.hpp b/examples/boltzmann1d/boltzmann1d.h similarity index 90% rename from examples/boltzmann1d/boltzmann1d.hpp rename to examples/boltzmann1d/boltzmann1d.h index f073a3f..84047a9 100644 --- a/examples/boltzmann1d/boltzmann1d.hpp +++ b/examples/boltzmann1d/boltzmann1d.h @@ -7,10 +7,10 @@ #define BOLTZMAN1D_HPP #include -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace kami; diff --git a/examples/boltzmann2d/CMakeLists.txt b/examples/boltzmann2d/CMakeLists.txt index ad185dd..c0781cc 100644 --- a/examples/boltzmann2d/CMakeLists.txt +++ b/examples/boltzmann2d/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(spdlog) create_executable( NAME ${EXAMPLE_NAME} SOURCES - boltzmann2d.cpp + boltzmann2d.cc PUBLIC_DEFINITIONS USE_DOUBLE_PRECISION=1 PRIVATE_DEFINITIONS diff --git a/examples/boltzmann2d/boltzmann2d.cpp b/examples/boltzmann2d/boltzmann2d.cc similarity index 97% rename from examples/boltzmann2d/boltzmann2d.cpp rename to examples/boltzmann2d/boltzmann2d.cc index f1f4d6a..543f605 100644 --- a/examples/boltzmann2d/boltzmann2d.cpp +++ b/examples/boltzmann2d/boltzmann2d.cc @@ -2,7 +2,7 @@ * TODO FILEHEADER */ -#include "boltzmann2d.hpp" +#include "boltzmann2d.h" #include #include @@ -13,11 +13,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace kami; diff --git a/examples/boltzmann2d/boltzmann2d.hpp b/examples/boltzmann2d/boltzmann2d.h similarity index 90% rename from examples/boltzmann2d/boltzmann2d.hpp rename to examples/boltzmann2d/boltzmann2d.h index 73afde8..ebfb9c1 100644 --- a/examples/boltzmann2d/boltzmann2d.hpp +++ b/examples/boltzmann2d/boltzmann2d.h @@ -7,10 +7,10 @@ #define BOLTZMAN2D_HPP #include -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace kami; diff --git a/examples/boltzmann3d/CMakeLists.txt b/examples/boltzmann3d/CMakeLists.txt index cb6e05f..a6518b6 100644 --- a/examples/boltzmann3d/CMakeLists.txt +++ b/examples/boltzmann3d/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(spdlog) create_executable( NAME ${EXAMPLE_NAME} SOURCES - boltzmann3d.cpp + boltzmann3d.cc PUBLIC_DEFINITIONS USE_DOUBLE_PRECISION=1 PRIVATE_DEFINITIONS diff --git a/examples/boltzmann3d/boltzmann3d.cpp b/examples/boltzmann3d/boltzmann3d.cc similarity index 97% rename from examples/boltzmann3d/boltzmann3d.cpp rename to examples/boltzmann3d/boltzmann3d.cc index b69215d..17d3468 100644 --- a/examples/boltzmann3d/boltzmann3d.cpp +++ b/examples/boltzmann3d/boltzmann3d.cc @@ -2,7 +2,7 @@ * TODO FILEHEADER */ -#include "boltzmann3d.hpp" +#include "boltzmann3d.h" #include #include @@ -13,11 +13,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include using namespace kami; diff --git a/examples/boltzmann3d/boltzmann3d.hpp b/examples/boltzmann3d/boltzmann3d.h similarity index 90% rename from examples/boltzmann3d/boltzmann3d.hpp rename to examples/boltzmann3d/boltzmann3d.h index a4aed16..235822d 100644 --- a/examples/boltzmann3d/boltzmann3d.hpp +++ b/examples/boltzmann3d/boltzmann3d.h @@ -7,10 +7,10 @@ #define BOLTZMAN3D_HPP #include -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace kami; diff --git a/include/kami/agent.hpp b/include/kami/agent.h similarity index 87% rename from include/kami/agent.hpp rename to include/kami/agent.h index 4a4abc5..a72c3b9 100644 --- a/include/kami/agent.hpp +++ b/include/kami/agent.h @@ -3,11 +3,11 @@ */ #pragma once -#ifndef KAMI_AGENT_HPP -#define KAMI_AGENT_HPP +#ifndef KAMI_AGENT_HXX +#define KAMI_AGENT_HXX #include -#include +#include #include namespace kami { @@ -26,19 +26,27 @@ class KAMI_EXPORT AgentID { std::string toString() const; /// \brief Test if two AgentID instances are equal. - friend bool operator==(const AgentID &, const AgentID &); + friend bool operator==( + const AgentID &lhs, + const AgentID &rhs); /// \brief Test if two AgentID instances are not equal. - friend bool operator!=(const AgentID &, const AgentID &); + friend bool operator!=( + const AgentID &lhs, + const AgentID &rhs); /// \brief Test if one AgentID is less than another. /// \details Due to the way AgentID instance are used internally, /// the AgentID must be ordered. The `<` operator provides /// basic order sufficient for `std::map`. - friend bool operator<(const AgentID &, const AgentID &); + friend bool operator<( + const AgentID &lhs, + const AgentID &rhs); /// \brief Output an AgentID to the specified output stream. - friend std::ostream &operator<<(std::ostream &, const AgentID &); + friend std::ostream &operator<<( + std::ostream &lhs, + const AgentID &rhs); private: static uint64_t idGen; @@ -64,8 +72,13 @@ class KAMI_EXPORT Agent { /// agent should perform as part of its time step should be in this function. virtual void step(); - friend bool operator==(const Agent &, const Agent &); - friend bool operator!=(const Agent &, const Agent &); + friend bool operator==( + const Agent &lhs, + const Agent &rhs); + + friend bool operator!=( + const Agent &lhs, + const Agent &rhs); private: AgentID agentID; @@ -130,4 +143,4 @@ class KAMI_EXPORT TwoActionAgent : public Agent { } // namespace kami -#endif // KAMI_AGENT_HPP +#endif // KAMI_AGENT_HXX diff --git a/include/kami/config.hpp.in b/include/kami/config.h.in similarity index 87% rename from include/kami/config.hpp.in rename to include/kami/config.h.in index a0fdd96..b6f52c9 100644 --- a/include/kami/config.hpp.in +++ b/include/kami/config.h.in @@ -8,12 +8,12 @@ */ #pragma once -#ifndef KAMI_VERSION_HPP -#define KAMI_VERSION_HPP +#ifndef KAMI_VERSION_HXX +#define KAMI_VERSION_HXX #define KAMI_VERSION_MAJOR @KAMI_VERSION_MAJOR@ #define KAMI_VERSION_MINOR @KAMI_VERSION_MINOR@ #define KAMI_VERSION_PATCH @KAMI_VERSION_PATCH@ #define KAMI_VERSION_STRING "@KAMI_VERSION_STRING@" -#endif // KAMI_VERSION_HPP +#endif // KAMI_VERSION_HXX diff --git a/include/kami/data/collector.hpp b/include/kami/data/collector.h similarity index 89% rename from include/kami/data/collector.hpp rename to include/kami/data/collector.h index 56bab34..df08767 100644 --- a/include/kami/data/collector.hpp +++ b/include/kami/data/collector.h @@ -7,7 +7,7 @@ // to build dll libraries that work on windows. // add the BAR_EXPORT definition to each // function/class you want to export to the dll. -#include +#include namespace foo { diff --git a/include/kami/domain.hpp b/include/kami/domain.h similarity index 57% rename from include/kami/domain.hpp rename to include/kami/domain.h index d572649..797aa05 100644 --- a/include/kami/domain.hpp +++ b/include/kami/domain.h @@ -3,11 +3,11 @@ */ #pragma once -#ifndef KAMI_DOMAIN_HPP -#define KAMI_DOMAIN_HPP +#ifndef KAMI_DOMAIN_HXX +#define KAMI_DOMAIN_HXX -#include -#include +#include +#include namespace kami { @@ -17,4 +17,4 @@ class KAMI_EXPORT Domain { } // namespace kami -#endif // KAMI_DOMAIN_HPP +#endif // KAMI_DOMAIN_HXX diff --git a/include/kami/grid.hpp b/include/kami/grid.h similarity index 80% rename from include/kami/grid.hpp rename to include/kami/grid.h index 7bfcf6a..e5fed2f 100644 --- a/include/kami/grid.hpp +++ b/include/kami/grid.h @@ -3,13 +3,13 @@ */ #pragma once -#ifndef KAMI_GRID_HPP -#define KAMI_GRID_HPP +#ifndef KAMI_GRID_HXX +#define KAMI_GRID_HXX #include -#include -#include -#include +#include +#include +#include namespace kami { @@ -28,7 +28,7 @@ enum KAMI_EXPORT GridNeighborhoodType { /// \brief Distance types for orthogonal grid domains enum KAMI_EXPORT GridDistanceType { Linear, - Taxicab }; + Taxicab }; /// \brief An abstract domain based on a grid with integer steps class KAMI_EXPORT GridDomain : public Domain { @@ -40,4 +40,4 @@ class KAMI_EXPORT GridCoord { } // namespace kami -#endif // KAMI_DOMAIN_HPP +#endif // KAMI_DOMAIN_HXX diff --git a/include/kami/grid1d.hpp b/include/kami/grid1d.h similarity index 93% rename from include/kami/grid1d.hpp rename to include/kami/grid1d.h index bc4472d..66de317 100644 --- a/include/kami/grid1d.hpp +++ b/include/kami/grid1d.h @@ -3,14 +3,14 @@ */ #pragma once -#ifndef KAMI_GRID1D_HPP -#define KAMI_GRID1D_HPP +#ifndef KAMI_GRID1D_HXX +#define KAMI_GRID1D_HXX #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -27,7 +27,7 @@ class KAMI_EXPORT GridCoord1D : public GridCoord { /// \brief Convert the identifier to a human readable string. std::string toString() const; - + /// Test if two coordinates are equal. friend bool operator==(const GridCoord1D &, const GridCoord1D &); @@ -114,4 +114,4 @@ class KAMI_EXPORT Grid1D : public GridDomain { } // namespace kami -#endif // KAMI_GRID1D_HPP +#endif // KAMI_GRID1D_HXX diff --git a/include/kami/grid2d.hpp b/include/kami/grid2d.h similarity index 94% rename from include/kami/grid2d.hpp rename to include/kami/grid2d.h index 8f07369..22ad28e 100644 --- a/include/kami/grid2d.hpp +++ b/include/kami/grid2d.h @@ -3,14 +3,14 @@ */ #pragma once -#ifndef KAMI_GRID2D_HPP -#define KAMI_GRID2D_HPP +#ifndef KAMI_GRID2D_HXX +#define KAMI_GRID2D_HXX #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -127,4 +127,4 @@ class KAMI_EXPORT Grid2D : public GridDomain { } // namespace kami -#endif // KAMI_GRID2D_HPP +#endif // KAMI_GRID2D_HXX diff --git a/include/kami/grid3d.hpp b/include/kami/grid3d.h similarity index 95% rename from include/kami/grid3d.hpp rename to include/kami/grid3d.h index 0b52ebc..cbcb51c 100644 --- a/include/kami/grid3d.hpp +++ b/include/kami/grid3d.h @@ -3,14 +3,14 @@ */ #pragma once -#ifndef KAMI_GRID3D_HPP -#define KAMI_GRID3D_HPP +#ifndef KAMI_GRID3D_HXX +#define KAMI_GRID3D_HXX #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -138,4 +138,4 @@ class KAMI_EXPORT Grid3D : public GridDomain { } // namespace kami -#endif // KAMI_GRID3D_HPP +#endif // KAMI_GRID3D_HXX diff --git a/include/kami/kami.h b/include/kami/kami.h new file mode 100644 index 0000000..5c3d7a4 --- /dev/null +++ b/include/kami/kami.h @@ -0,0 +1,15 @@ +/*- + * TODO FILEHEADER + */ + +#pragma once +#ifndef KAMI_KAMI_HXX +#define KAMI_KAMI_HXX + +#include +#include +#include +#include +#include + +#endif // KAMI_KAMI_HXX diff --git a/include/kami/kami.hpp b/include/kami/kami.hpp deleted file mode 100644 index d574628..0000000 --- a/include/kami/kami.hpp +++ /dev/null @@ -1,15 +0,0 @@ -/*- - * TODO FILEHEADER - */ - -#pragma once -#ifndef KAMI_KAMI_HPP -#define KAMI_KAMI_HPP - -#include -#include -#include -#include -#include - -#endif // KAMI_KAMI_HPP diff --git a/include/kami/model.hpp b/include/kami/model.h similarity index 83% rename from include/kami/model.hpp rename to include/kami/model.h index d5b80e3..53ae6f7 100644 --- a/include/kami/model.hpp +++ b/include/kami/model.h @@ -3,11 +3,11 @@ */ #pragma once -#ifndef KAMI_MODEL_HPP -#define KAMI_MODEL_HPP +#ifndef KAMI_MODEL_HXX +#define KAMI_MODEL_HXX -#include -#include +#include +#include namespace kami { @@ -32,4 +32,4 @@ class KAMI_EXPORT Model { } // namespace kami -#endif // KAMI_MODEL_HPP +#endif // KAMI_MODEL_HXX diff --git a/include/kami/multigrid1d.h b/include/kami/multigrid1d.h new file mode 100644 index 0000000..1244994 --- /dev/null +++ b/include/kami/multigrid1d.h @@ -0,0 +1,27 @@ +/*- + * TODO FILEHEADER + */ + +#pragma once +#ifndef KAMI_MULTIGRID1D_HXX +#define KAMI_MULTIGRID1D_HXX + +#include +#include +#include +#include +#include +#include + +namespace kami { + +class KAMI_EXPORT MultiGrid1D : public Grid1D { + public: + MultiGrid1D(unsigned int, bool); + + bool addAgent(AgentID, GridCoord1D); +}; + +} // namespace kami + +#endif // KAMI_MULTIGRID1D_HXX diff --git a/include/kami/multigrid1d.hpp b/include/kami/multigrid1d.hpp deleted file mode 100644 index d7927f6..0000000 --- a/include/kami/multigrid1d.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/*- - * TODO FILEHEADER - */ - -#pragma once -#ifndef KAMI_MULTIGRID1D_HPP -#define KAMI_MULTIGRID1D_HPP - -#include -#include -#include -#include -#include -#include - -namespace kami { - -class KAMI_EXPORT MultiGrid1D : public Grid1D { - public: - MultiGrid1D(unsigned int, bool); - - bool addAgent(AgentID, GridCoord1D); -}; - -} // namespace kami - -#endif // KAMI_MULTIGRID1D_HPP diff --git a/include/kami/multigrid2d.h b/include/kami/multigrid2d.h new file mode 100644 index 0000000..d45b032 --- /dev/null +++ b/include/kami/multigrid2d.h @@ -0,0 +1,27 @@ +/*- + * TODO FILEHEADER + */ + +#pragma once +#ifndef KAMI_MULTIGRID2D_HXX +#define KAMI_MULTIGRID2D_HXX + +#include +#include +#include +#include +#include +#include + +namespace kami { + +class KAMI_EXPORT MultiGrid2D : public Grid2D { + public: + MultiGrid2D(unsigned int, unsigned int, bool, bool); + + bool addAgent(AgentID, GridCoord2D); +}; + +} // namespace kami + +#endif // KAMI_MULTIGRID2D_HXX diff --git a/include/kami/multigrid2d.hpp b/include/kami/multigrid2d.hpp deleted file mode 100644 index ff81564..0000000 --- a/include/kami/multigrid2d.hpp +++ /dev/null @@ -1,27 +0,0 @@ -/*- - * TODO FILEHEADER - */ - -#pragma once -#ifndef KAMI_MULTIGRID2D_HPP -#define KAMI_MULTIGRID2D_HPP - -#include -#include -#include -#include -#include -#include - -namespace kami { - -class KAMI_EXPORT MultiGrid2D : public Grid2D { - public: - MultiGrid2D(unsigned int, unsigned int, bool, bool); - - bool addAgent(AgentID, GridCoord2D); -}; - -} // namespace kami - -#endif // KAMI_MULTIGRID2D_HPP diff --git a/include/kami/multigrid3d.hpp b/include/kami/multigrid3d.h similarity index 51% rename from include/kami/multigrid3d.hpp rename to include/kami/multigrid3d.h index 980d069..434893f 100644 --- a/include/kami/multigrid3d.hpp +++ b/include/kami/multigrid3d.h @@ -3,15 +3,15 @@ */ #pragma once -#ifndef KAMI_MULTIGRID3D_HPP -#define KAMI_MULTIGRID3D_HPP +#ifndef KAMI_MULTIGRID3D_HXX +#define KAMI_MULTIGRID3D_HXX -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kami { @@ -24,4 +24,4 @@ class KAMI_EXPORT MultiGrid3D : public Grid3D { } // namespace kami -#endif // KAMI_MULTIGRID3D_HPP +#endif // KAMI_MULTIGRID3D_HXX diff --git a/include/kami/random.hpp b/include/kami/random.h similarity index 95% rename from include/kami/random.hpp rename to include/kami/random.h index aff920c..7d0ac5e 100644 --- a/include/kami/random.hpp +++ b/include/kami/random.h @@ -1,10 +1,10 @@ #pragma once -#ifndef KAMI_RANDOM_HPP -#define KAMI_RANDOM_HPP +#ifndef KAMI_RANDOM_HXX +#define KAMI_RANDOM_HXX #include -#include -#include +#include +#include #include #include @@ -73,4 +73,4 @@ class KAMI_EXPORT TwoActionRandomScheduler : public RandomScheduler { }; // namespace kami -#endif // KAMI_RANDOM_HPP +#endif // KAMI_RANDOM_HXX diff --git a/include/kami/scheduler.hpp b/include/kami/scheduler.h similarity index 88% rename from include/kami/scheduler.hpp rename to include/kami/scheduler.h index 509988e..535d806 100644 --- a/include/kami/scheduler.hpp +++ b/include/kami/scheduler.h @@ -3,11 +3,11 @@ */ #pragma once -#ifndef KAMI_SCHEDULER_HPP -#define KAMI_SCHEDULER_HPP +#ifndef KAMI_SCHEDULER_HXX +#define KAMI_SCHEDULER_HXX -#include -#include +#include +#include namespace kami { @@ -42,4 +42,4 @@ class KAMI_EXPORT Scheduler { } // namespace kami -#endif // KAMI_SCHEDULER_HPP +#endif // KAMI_SCHEDULER_HXX diff --git a/include/kami/sequential.hpp b/include/kami/sequential.h similarity index 90% rename from include/kami/sequential.hpp rename to include/kami/sequential.h index c70706f..5671719 100644 --- a/include/kami/sequential.hpp +++ b/include/kami/sequential.h @@ -1,12 +1,12 @@ #pragma once -#ifndef KAMI_SEQUENTIAL_HPP -#define KAMI_SEQUENTIAL_HPP +#ifndef KAMI_SEQUENTIAL_HXX +#define KAMI_SEQUENTIAL_HXX #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace kami { @@ -54,4 +54,4 @@ class KAMI_EXPORT SequentialScheduler : public Scheduler { }; // namespace kami -#endif // KAMI_SEQUENTIAL_HPP +#endif // KAMI_SEQUENTIAL_HXX diff --git a/include/kami/sologrid1d.h b/include/kami/sologrid1d.h new file mode 100644 index 0000000..077eb8d --- /dev/null +++ b/include/kami/sologrid1d.h @@ -0,0 +1,26 @@ +/*- + * TODO FILEHEADER + */ + +#pragma once +#ifndef KAMI_SOLOGRID1D_HXX +#define KAMI_SOLOGRID1D_HXX + +#include +#include +#include +#include +#include +#include + +namespace kami { + +class KAMI_EXPORT SoloGrid1D : public Grid1D { + public: + SoloGrid1D(unsigned int, bool); + + bool addAgent(AgentID, GridCoord1D); +}; +} // namespace kami + +#endif // KAMI_SOLOGRID1D_HXX diff --git a/include/kami/sologrid1d.hpp b/include/kami/sologrid1d.hpp deleted file mode 100644 index 1918d96..0000000 --- a/include/kami/sologrid1d.hpp +++ /dev/null @@ -1,26 +0,0 @@ -/*- - * TODO FILEHEADER - */ - -#pragma once -#ifndef KAMI_SOLOGRID1D_HPP -#define KAMI_SOLOGRID1D_HPP - -#include -#include -#include -#include -#include -#include - -namespace kami { - -class KAMI_EXPORT SoloGrid1D : public Grid1D { - public: - SoloGrid1D(unsigned int, bool); - - bool addAgent(AgentID, GridCoord1D); -}; -} // namespace kami - -#endif // KAMI_SOLOGRID1D_HPP diff --git a/include/kami/sologrid2d.hpp b/include/kami/sologrid2d.h similarity index 51% rename from include/kami/sologrid2d.hpp rename to include/kami/sologrid2d.h index 8c4b811..ed1ef29 100644 --- a/include/kami/sologrid2d.hpp +++ b/include/kami/sologrid2d.h @@ -3,15 +3,15 @@ */ #pragma once -#ifndef KAMI_SOLOGRID2D_HPP -#define KAMI_SOLOGRID2D_HPP +#ifndef KAMI_SOLOGRID2D_HXX +#define KAMI_SOLOGRID2D_HXX -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace kami { @@ -25,4 +25,4 @@ class KAMI_EXPORT SoloGrid2D : public Grid2D { } // namespace kami -#endif // KAMI_SOLOGRID2D_HPP +#endif // KAMI_SOLOGRID2D_HXX diff --git a/include/kami/sologrid3d.hpp b/include/kami/sologrid3d.h similarity index 51% rename from include/kami/sologrid3d.hpp rename to include/kami/sologrid3d.h index f45e92b..63ccfe5 100644 --- a/include/kami/sologrid3d.hpp +++ b/include/kami/sologrid3d.h @@ -3,15 +3,15 @@ */ #pragma once -#ifndef KAMI_SOLOGRID3D_HPP -#define KAMI_SOLOGRID3D_HPP +#ifndef KAMI_SOLOGRID3D_HXX +#define KAMI_SOLOGRID3D_HXX -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kami { @@ -24,4 +24,4 @@ class KAMI_EXPORT SoloGrid3D : public Grid3D { } // namespace kami -#endif // KAMI_SOLOGRID3D_HPP +#endif // KAMI_SOLOGRID3D_HXX diff --git a/include/kami/staged.hpp b/include/kami/staged.h similarity index 91% rename from include/kami/staged.hpp rename to include/kami/staged.h index 7ec757b..c55ba09 100644 --- a/include/kami/staged.hpp +++ b/include/kami/staged.h @@ -1,12 +1,12 @@ #pragma once -#ifndef KAMI_STAGED_HPP -#define KAMI_STAGED_HPP +#ifndef KAMI_STAGED_HXX +#define KAMI_STAGED_HXX #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace kami { @@ -56,4 +56,4 @@ class KAMI_EXPORT StagedScheduler : public Scheduler { }; // namespace kami -#endif // KAMI_STAGED_HPP +#endif // KAMI_STAGED_HXX diff --git a/src/kami/CMakeLists.txt b/src/kami/CMakeLists.txt index efb619a..2d533d7 100644 --- a/src/kami/CMakeLists.txt +++ b/src/kami/CMakeLists.txt @@ -8,32 +8,32 @@ project(libkami VERSION ${KAMI_VERSION_STRING} create_library(NAME kami NAMESPACE kami SOURCES - agent.cpp - grid1d.cpp - grid2d.cpp - grid3d.cpp - kami.cpp - multigrid1d.cpp - multigrid2d.cpp - multigrid3d.cpp - random.cpp - sequential.cpp - sologrid1d.cpp - sologrid2d.cpp - sologrid3d.cpp - staged.cpp + agent.cc + grid1d.cc + grid2d.cc + grid3d.cc + kami.cc + multigrid1d.cc + multigrid2d.cc + multigrid3d.cc + random.cc + sequential.cc + sologrid1d.cc + sologrid2d.cc + sologrid3d.cc + staged.cc PUBLIC_INCLUDE_PATHS "$" "$" PRIVATE_LINKED_TARGETS ${COVERAGE_TARGET} EXPORT_FILE_PATH - "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/KAMI_EXPORT.hpp" + "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/KAMI_EXPORT.h" ) configure_file( - "${CMAKE_SOURCE_DIR}/include/kami/config.hpp.in" - "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/config.hpp") + "${CMAKE_SOURCE_DIR}/include/kami/config.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/config.h") set_target_properties(kami PROPERTIES VERSION ${KAMI_VERSION_STRING} SOVERSION ${KAMI_VERSION_MAJOR}) @@ -58,8 +58,8 @@ set_target_properties(kami PROPERTIES VERSION ${KAMI_VERSION_STRING} # /include/${NAMESPACE}/LIBRARY_NAME/LIBRARY_NAME_export.h install( FILES - "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/KAMI_EXPORT.hpp" - "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/config.hpp" + "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/KAMI_EXPORT.h" + "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/kami" ) diff --git a/src/kami/agent.cpp b/src/kami/agent.cc similarity index 97% rename from src/kami/agent.cpp rename to src/kami/agent.cc index ccb6b3a..06c241a 100644 --- a/src/kami/agent.cpp +++ b/src/kami/agent.cc @@ -2,7 +2,7 @@ * TODO FILE HEADER */ -#include +#include #include namespace kami { diff --git a/src/kami/grid1d.cpp b/src/kami/grid1d.cc similarity index 96% rename from src/kami/grid1d.cpp rename to src/kami/grid1d.cc index c31eb57..14896de 100644 --- a/src/kami/grid1d.cpp +++ b/src/kami/grid1d.cc @@ -2,11 +2,11 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/kami/grid2d.cpp b/src/kami/grid2d.cc similarity index 97% rename from src/kami/grid2d.cpp rename to src/kami/grid2d.cc index 2507be8..9f597eb 100644 --- a/src/kami/grid2d.cpp +++ b/src/kami/grid2d.cc @@ -2,11 +2,11 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/kami/grid3d.cpp b/src/kami/grid3d.cc similarity index 98% rename from src/kami/grid3d.cpp rename to src/kami/grid3d.cc index 847a65b..e738832 100644 --- a/src/kami/grid3d.cpp +++ b/src/kami/grid3d.cc @@ -2,11 +2,11 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/kami/kami.cpp b/src/kami/kami.cc similarity index 67% rename from src/kami/kami.cpp rename to src/kami/kami.cc index 100538c..21a1328 100644 --- a/src/kami/kami.cpp +++ b/src/kami/kami.cc @@ -2,8 +2,8 @@ * TODO FILE HEADER */ -#include -#include +#include +#include namespace kami { diff --git a/src/kami/multigrid1d.cpp b/src/kami/multigrid1d.cc similarity index 73% rename from src/kami/multigrid1d.cpp rename to src/kami/multigrid1d.cc index e63f5ee..84b52bf 100644 --- a/src/kami/multigrid1d.cpp +++ b/src/kami/multigrid1d.cc @@ -2,12 +2,12 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kami { diff --git a/src/kami/multigrid2d.cpp b/src/kami/multigrid2d.cc similarity index 76% rename from src/kami/multigrid2d.cpp rename to src/kami/multigrid2d.cc index 1b40e0c..b351239 100644 --- a/src/kami/multigrid2d.cpp +++ b/src/kami/multigrid2d.cc @@ -2,12 +2,12 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kami { diff --git a/src/kami/multigrid3d.cpp b/src/kami/multigrid3d.cc similarity index 80% rename from src/kami/multigrid3d.cpp rename to src/kami/multigrid3d.cc index bffbaaf..315d5b5 100644 --- a/src/kami/multigrid3d.cpp +++ b/src/kami/multigrid3d.cc @@ -2,12 +2,12 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/kami/random.cpp b/src/kami/random.cc similarity index 93% rename from src/kami/random.cpp rename to src/kami/random.cc index 5046596..1b5ab76 100644 --- a/src/kami/random.cpp +++ b/src/kami/random.cc @@ -2,10 +2,10 @@ * TODO FILE HEADER */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/kami/sequential.cpp b/src/kami/sequential.cc similarity index 88% rename from src/kami/sequential.cpp rename to src/kami/sequential.cc index d63b712..dd0b977 100644 --- a/src/kami/sequential.cpp +++ b/src/kami/sequential.cc @@ -2,10 +2,10 @@ * TODO FILE HEADER */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/kami/sologrid1d.cpp b/src/kami/sologrid1d.cc similarity index 74% rename from src/kami/sologrid1d.cpp rename to src/kami/sologrid1d.cc index 11d6fc2..70948c1 100644 --- a/src/kami/sologrid1d.cpp +++ b/src/kami/sologrid1d.cc @@ -2,12 +2,12 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kami { diff --git a/src/kami/sologrid2d.cpp b/src/kami/sologrid2d.cc similarity index 77% rename from src/kami/sologrid2d.cpp rename to src/kami/sologrid2d.cc index a6205c1..664546a 100644 --- a/src/kami/sologrid2d.cpp +++ b/src/kami/sologrid2d.cc @@ -2,12 +2,12 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace kami { diff --git a/src/kami/sologrid3d.cpp b/src/kami/sologrid3d.cc similarity index 80% rename from src/kami/sologrid3d.cpp rename to src/kami/sologrid3d.cc index 33e4238..14e78ce 100644 --- a/src/kami/sologrid3d.cpp +++ b/src/kami/sologrid3d.cc @@ -2,12 +2,12 @@ * TODO FILEHEADER */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace kami { diff --git a/src/kami/staged.cpp b/src/kami/staged.cc similarity index 91% rename from src/kami/staged.cpp rename to src/kami/staged.cc index 3d326d8..8b0d4e9 100644 --- a/src/kami/staged.cpp +++ b/src/kami/staged.cc @@ -2,11 +2,11 @@ * TODO FILE HEADER */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/kamidata/CMakeLists.txt b/src/kamidata/CMakeLists.txt index 86cace9..a6e6f75 100644 --- a/src/kamidata/CMakeLists.txt +++ b/src/kamidata/CMakeLists.txt @@ -8,14 +8,14 @@ project(libkamidata VERSION ${KAMI_VERSION_STRING} create_library(NAME kamidata NAMESPACE kamidata SOURCES - baz.cpp + baz.cc PUBLIC_INCLUDE_PATHS "$" "$" PRIVATE_LINKED_TARGETS ${COVERAGE_TARGET} EXPORT_FILE_PATH - "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/data/KAMIDATA_EXPORT.hpp" + "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/data/KAMIDATA_EXPORT.h" ) set_target_properties(kamidata PROPERTIES VERSION ${KAMI_VERSION_STRING} @@ -41,7 +41,7 @@ set_target_properties(kamidata PROPERTIES VERSION ${KAMI_VERSION_STRING} # /include/${NAMESPACE}/LIBRARY_NAME/LIBRARY_NAME_export.h install( FILES - "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/data/KAMIDATA_EXPORT.hpp" + "${CMAKE_CURRENT_BINARY_DIR}/generated_headers/kami/data/KAMIDATA_EXPORT.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/kami/data" ) diff --git a/src/kamidata/baz.cpp b/src/kamidata/baz.cc similarity index 100% rename from src/kamidata/baz.cpp rename to src/kamidata/baz.cc diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d260e91..03cf85c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,7 +9,7 @@ find_package(spdlog) create_test( NAME unit-kami-agentid SOURCES - unit-kami-agentid.cpp + unit-kami-agentid.cc PUBLIC_LINKED_TARGETS kami::kami spdlog::spdlog @@ -22,7 +22,7 @@ create_test( NAME create_test( NAME unit-kami-agent SOURCES - unit-kami-agent.cpp + unit-kami-agent.cc PUBLIC_LINKED_TARGETS kami::kami spdlog::spdlog diff --git a/test/unit-kami-agent.cpp b/test/unit-kami-agent.cc similarity index 94% rename from test/unit-kami-agent.cpp rename to test/unit-kami-agent.cc index 755cc78..1389992 100644 --- a/test/unit-kami-agent.cpp +++ b/test/unit-kami-agent.cc @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include #include using namespace kami; diff --git a/test/unit-kami-agentid.cpp b/test/unit-kami-agentid.cc similarity index 94% rename from test/unit-kami-agentid.cpp rename to test/unit-kami-agentid.cc index e2f1e42..5b433c0 100644 --- a/test/unit-kami-agentid.cpp +++ b/test/unit-kami-agentid.cc @@ -8,8 +8,8 @@ #include #include #include -#include -#include +#include +#include #include using namespace kami;