summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaslersn <sebastian.hasler@gmx.net>2019-07-07 18:43:18 +0200
committerhaslersn <sebastian.hasler@gmx.net>2019-07-08 00:39:02 +0200
commitd605958309016d357410d514cf2b799d0417ac26 (patch)
treee3ffcbe8d8c355c017fe7d967f484b7b4a9e96c6
parentc04e05dede66e46e2d1a66fab657bf3a9f7e4d44 (diff)
include: Correct header guard names
Also, the combination of `#pragma once` and header guards is now used. This should speed up compilation in case `#pragma once` is supported.
-rw-r--r--include/djinterop/album_art.hpp7
-rw-r--r--include/djinterop/crate.hpp7
-rw-r--r--include/djinterop/database.hpp7
-rw-r--r--include/djinterop/djinterop.hpp23
-rw-r--r--include/djinterop/enginelibrary.hpp21
-rw-r--r--include/djinterop/exceptions.hpp21
-rw-r--r--include/djinterop/musical_key.hpp7
-rw-r--r--include/djinterop/pad_color.hpp9
-rw-r--r--include/djinterop/performance_data.hpp9
-rw-r--r--include/djinterop/semantic_version.hpp21
-rw-r--r--include/djinterop/track.hpp9
11 files changed, 116 insertions, 25 deletions
diff --git a/include/djinterop/album_art.hpp b/include/djinterop/album_art.hpp
index 7202f77..7619b18 100644
--- a/include/djinterop/album_art.hpp
+++ b/include/djinterop/album_art.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_ALBUM_ART_HPP
+#define DJINTEROP_ALBUM_ART_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_ALBUM_ART_HPP
-#define DJINTEROP_ALBUM_ART_HPP
-
#include <chrono>
#include <cstdint>
#include <memory>
diff --git a/include/djinterop/crate.hpp b/include/djinterop/crate.hpp
index e1dbdf2..fc7045b 100644
--- a/include/djinterop/crate.hpp
+++ b/include/djinterop/crate.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_CRATE_HPP
+#define DJINTEROP_CRATE_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_CRATE_HPP
-#define DJINTEROP_CRATE_HPP
-
#include <memory>
#include <stdexcept>
#include <string>
diff --git a/include/djinterop/database.hpp b/include/djinterop/database.hpp
index 3a93762..3b73ac3 100644
--- a/include/djinterop/database.hpp
+++ b/include/djinterop/database.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_DATABASE_HPP
+#define DJINTEROP_DATABASE_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_DATABASE_HPP
-#define DJINTEROP_DATABASE_HPP
-
#include <memory>
#include <vector>
diff --git a/include/djinterop/djinterop.hpp b/include/djinterop/djinterop.hpp
index 5e78144..669fae0 100644
--- a/include/djinterop/djinterop.hpp
+++ b/include/djinterop/djinterop.hpp
@@ -1,4 +1,23 @@
+/*
+ This file is part of libdjinterop.
+
+ libdjinterop is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ libdjinterop 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#pragma once
+#ifndef DJINTEROP_DJINTEROP_HPP
+#define DJINTEROP_DJINTEROP_HPP
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
@@ -13,4 +32,6 @@
#include <djinterop/pad_color.hpp>
#include <djinterop/performance_data.hpp>
#include <djinterop/semantic_version.hpp>
-#include <djinterop/track.hpp> \ No newline at end of file
+#include <djinterop/track.hpp>
+
+#endif // DJINTEROP_DJINTEROP_HPP
diff --git a/include/djinterop/enginelibrary.hpp b/include/djinterop/enginelibrary.hpp
index 5a957cf..d119561 100644
--- a/include/djinterop/enginelibrary.hpp
+++ b/include/djinterop/enginelibrary.hpp
@@ -1,4 +1,23 @@
+/*
+ This file is part of libdjinterop.
+
+ libdjinterop is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ libdjinterop 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#pragma once
+#ifndef DJINTEROP_ENGINELIBRARY_HPP
+#define DJINTEROP_ENGINELIBRARY_HPP
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
@@ -54,3 +73,5 @@ std::string perfdata_db_path(const database& db);
} // namespace enginelibrary
} // namespace djinterop
+
+#endif // DJINTEROP_ENGINELIBRARY_HPP
diff --git a/include/djinterop/exceptions.hpp b/include/djinterop/exceptions.hpp
index 2373760..d94ee3a 100644
--- a/include/djinterop/exceptions.hpp
+++ b/include/djinterop/exceptions.hpp
@@ -1,4 +1,23 @@
+/*
+ This file is part of libdjinterop.
+
+ libdjinterop is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ libdjinterop 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#pragma once
+#ifndef DJINTEROP_EXCEPTIONS_HPP
+#define DJINTEROP_EXCEPTIONS_HPP
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
@@ -119,3 +138,5 @@ private:
};
} // namespace djinterop
+
+#endif // DJINTEROP_EXCEPTIONS_HPP
diff --git a/include/djinterop/musical_key.hpp b/include/djinterop/musical_key.hpp
index db3b032..c87cfa3 100644
--- a/include/djinterop/musical_key.hpp
+++ b/include/djinterop/musical_key.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_MUSICAL_KEY_HPP
+#define DJINTEROP_MUSICAL_KEY_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_MUSICAL_KEY_HPP
-#define DJINTEROP_MUSICAL_KEY_HPP
-
namespace djinterop
{
/**
diff --git a/include/djinterop/pad_color.hpp b/include/djinterop/pad_color.hpp
index dbe0164..ea3be5c 100644
--- a/include/djinterop/pad_color.hpp
+++ b/include/djinterop/pad_color.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_PAD_COLOR_HPP
+#define DJINTEROP_PAD_COLOR_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_ENGINELIBRARY_PAD_COLOR_HPP
-#define DJINTEROP_ENGINELIBRARY_PAD_COLOR_HPP
-
namespace djinterop
{
/**
@@ -95,4 +96,4 @@ const pad_color pads[] = {pad_1, pad_2, pad_3, pad_4,
} // namespace djinterop
-#endif // DJINTEROP_ENGINELIBRARY_PAD_COLOR_HPP
+#endif // DJINTEROP_PAD_COLOR_HPP
diff --git a/include/djinterop/performance_data.hpp b/include/djinterop/performance_data.hpp
index 35f1199..a8f8f33 100644
--- a/include/djinterop/performance_data.hpp
+++ b/include/djinterop/performance_data.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_PERFORMANCE_DATA_HPP
+#define DJINTEROP_PERFORMANCE_DATA_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_ENGINELIBRARY_PERFORMANCE_DATA_HPP
-#define DJINTEROP_ENGINELIBRARY_PERFORMANCE_DATA_HPP
-
#include <chrono>
#include <cstdint>
#include <memory>
@@ -89,4 +90,4 @@ struct waveform_entry
} // namespace djinterop
-#endif // DJINTEROP_ENGINELIBRARY_PERFORMANCE_DATA_HPP
+#endif // DJINTEROP_PERFORMANCE_DATA_HPP
diff --git a/include/djinterop/semantic_version.hpp b/include/djinterop/semantic_version.hpp
index d28975b..514f912 100644
--- a/include/djinterop/semantic_version.hpp
+++ b/include/djinterop/semantic_version.hpp
@@ -1,4 +1,23 @@
+/*
+ This file is part of libdjinterop.
+
+ libdjinterop is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ libdjinterop 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 Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#pragma once
+#ifndef DJINTEROP_SEMANTIC_VERSION_HPP
+#define DJINTEROP_SEMANTIC_VERSION_HPP
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
@@ -68,3 +87,5 @@ inline bool operator<(const semantic_version &a, const semantic_version &b)
}
} // namespace djinterop
+
+#endif // DJINTEROP_SEMANTIC_VERSION_HPP
diff --git a/include/djinterop/track.hpp b/include/djinterop/track.hpp
index 7e6907e..2efbf16 100644
--- a/include/djinterop/track.hpp
+++ b/include/djinterop/track.hpp
@@ -15,13 +15,14 @@
along with libdjinterop. If not, see <http://www.gnu.org/licenses/>.
*/
+#pragma once
+#ifndef DJINTEROP_TRACK_HPP
+#define DJINTEROP_TRACK_HPP
+
#if __cplusplus < 201103L && _MSVC_LANG < 201103L
#error This library needs at least a C++11 compliant compiler
#endif
-#ifndef DJINTEROP_ENGINELIBRARY_TRACK_HPP
-#define DJINTEROP_ENGINELIBRARY_TRACK_HPP
-
#include <chrono>
#include <memory>
#include <stdexcept>
@@ -323,4 +324,4 @@ private:
} // namespace djinterop
-#endif // DJINTEROP_ENGINELIBRARY_TRACK_HPP
+#endif // DJINTEROP_TRACK_HPP