From e1e5dce427f5976e0bd34127c8c877eb26255ae4 Mon Sep 17 00:00:00 2001 From: Martin Zenzes Date: Thu, 3 Mar 2016 15:36:52 +0100 Subject: [PATCH 1/3] gitignore Signed-off-by: Martin Zenzes --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build From 441d5fb077ea7ef5c6466d50ab0b523d86fd7ed7 Mon Sep 17 00:00:00 2001 From: Martin Zenzes Date: Thu, 3 Mar 2016 15:34:14 +0100 Subject: [PATCH 2/3] rename c++ header files from "...h" to "...hpp" Signed-off-by: Martin Zenzes --- CMakeLists.txt | 4 ++-- doc/configmaps.md | 4 ++-- src/ConfigData.cpp | 2 +- src/{ConfigData.h => ConfigData.hpp} | 10 +++++----- src/{FIFOMap.h => FIFOMap.hpp} | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) rename src/{ConfigData.h => ConfigData.hpp} (99%) rename src/{FIFOMap.h => FIFOMap.hpp} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4dc38a..f914bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ set(SOURCES src/ConfigData.cpp ) set(HEADERS - src/ConfigData.h - src/FIFOMap.h + src/ConfigData.hpp + src/FIFOMap.hpp ) add_library(${PROJECT_NAME} SHARED ${SOURCES}) diff --git a/doc/configmaps.md b/doc/configmaps.md index 63b1ba4..d7a8421 100644 --- a/doc/configmaps.md +++ b/doc/configmaps.md @@ -12,7 +12,7 @@ The ConfigMap is a nested implementation of std::maps and std::vectors to provid - double - bool -An important feature is the loading and storing of ConfigMaps in yaml files. The example shows the usage of ConfigMaps for further details check [ConfigMap](@ref mars::utils::ConfigData.h). +An important feature is the loading and storing of ConfigMaps in yaml files. The example shows the usage of ConfigMaps for further details check [ConfigMap](@ref mars::utils::ConfigData.hpp). Note: While reading and writing yaml files the order of dictionaries is not necessarily kept. @@ -28,7 +28,7 @@ Yaml example file: Example program: - #include + #include int main(int argc, char *argv[]) { diff --git a/src/ConfigData.cpp b/src/ConfigData.cpp index 245aa52..e9c5d18 100644 --- a/src/ConfigData.cpp +++ b/src/ConfigData.cpp @@ -1,4 +1,4 @@ -#include "ConfigData.h" +#include "ConfigData.hpp" #include #include diff --git a/src/ConfigData.h b/src/ConfigData.hpp similarity index 99% rename from src/ConfigData.h rename to src/ConfigData.hpp index 63e99d1..9208e94 100644 --- a/src/ConfigData.h +++ b/src/ConfigData.hpp @@ -18,11 +18,11 @@ * */ -#ifndef CONFIG_DATA_H -#define CONFIG_DATA_H +#ifndef CONFIG_DATA_HPP +#define CONFIG_DATA_HPP #ifdef _PRINT_HEADER_ - #warning "ConfigData.h" + #warning "ConfigData.hpp" #endif #include @@ -31,7 +31,7 @@ #include #include -#include "FIFOMap.h" +#include "FIFOMap.hpp" namespace configmaps { @@ -729,4 +729,4 @@ namespace configmaps { } // end of namespace configmaps -#endif // CONFIG_DATA_H +#endif // CONFIG_DATA_HPP diff --git a/src/FIFOMap.h b/src/FIFOMap.hpp similarity index 98% rename from src/FIFOMap.h rename to src/FIFOMap.hpp index 1b897a5..e70f6e2 100644 --- a/src/FIFOMap.h +++ b/src/FIFOMap.hpp @@ -18,11 +18,11 @@ * */ -#ifndef MARS_UTILS_FIFO_MAP_H -#define MARS_UTILS_FIFO_MAP_H +#ifndef MARS_UTILS_FIFO_MAP_HPP +#define MARS_UTILS_FIFO_MAP_HPP #ifdef _PRINT_HEADER_ -#warning "FIFOMap.h" +#warning "FIFOMap.hpp" #endif #include @@ -241,4 +241,4 @@ namespace configmaps { } // end of namespace configmaps -#endif /* MARS_UTILS_FIFO_MAP_H */ +#endif /* MARS_UTILS_FIFO_MAP_HPP */ From 8bbf9dcb5a4918e2d54b7d938505cb7aef60aab2 Mon Sep 17 00:00:00 2001 From: Martin Zenzes Date: Thu, 3 Mar 2016 15:36:46 +0100 Subject: [PATCH 3/3] add compatibility headers after renaming Signed-off-by: Martin Zenzes --- CMakeLists.txt | 5 +++++ src/ConfigData.h | 5 +++++ src/FIFOMap.h | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 src/ConfigData.h create mode 100644 src/FIFOMap.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f914bd3..2c3a5f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,11 @@ install(TARGETS ${PROJECT_NAME} ${_INSTALL_DESTINATIONS}) # Install headers into mars include directory install(FILES ${HEADERS} DESTINATION include/configmaps) +# MZ: some compatiblity headers after renaming. keep around for a month, then +# delete. +install(FILES src/ConfigData.h DESTINATION include/configmaps) +install(FILES src/FIFOMap.h DESTINATION include/configmaps) + # Prepare and install necessary files to support finding of the library # using pkg-config configure_file(${PROJECT_NAME}.pc.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) diff --git a/src/ConfigData.h b/src/ConfigData.h new file mode 100644 index 0000000..b4f7d12 --- /dev/null +++ b/src/ConfigData.h @@ -0,0 +1,5 @@ +// MZ: renamed "src/ConfigData.h" to "src/ConfigData.hpp" at 03.03.2016 +// +// keep this file around for a month or so, then delete it +#warning "do not include this file, use 'ConfigData.hpp' instead" +#include "ConfigData.hpp" diff --git a/src/FIFOMap.h b/src/FIFOMap.h new file mode 100644 index 0000000..c6e021a --- /dev/null +++ b/src/FIFOMap.h @@ -0,0 +1,5 @@ +// MZ: renamed "src/FIFOMap.h" to "src/FIFOMap.hpp" at 03.03.2016 +// +// keep this file around for a month or so, then delete it +#warning "do not include this file, use 'FIFOMap.hpp' instead" +#include "FIFOMap.hpp"