From 985625ee42319406925f148d6a3975426708d6bf Mon Sep 17 00:00:00 2001 From: Ray <57572379+JustCallMeRay@users.noreply.github.com> Date: Mon, 3 Feb 2025 14:03:43 +0000 Subject: [PATCH] Changes defines in include guards to avoid undefined behaviour (#483) Co-authored-by: Olek Raymond --- include/CXXGraph/CXXGraphConfig.h | 8 ++++---- include/CXXGraph/Edge/DirectedWeightedEdge.h | 6 +++--- include/CXXGraph/Edge/DirectedWeightedEdge_decl.h | 6 +++--- include/CXXGraph/Edge/Edge.h | 6 +++--- include/CXXGraph/Edge/Edge_decl.h | 6 +++--- include/CXXGraph/Edge/UndirectedEdge.h | 6 +++--- include/CXXGraph/Edge/UndirectedEdge_decl.h | 6 +++--- include/CXXGraph/Edge/UndirectedWeightedEdge.h | 6 +++--- include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h | 6 +++--- include/CXXGraph/Edge/Weighted.h | 6 +++--- include/CXXGraph/Edge/Weighted_decl.h | 6 +++--- include/CXXGraph/Graph/Graph.h | 8 +++++--- include/CXXGraph/Graph/Graph_decl.h | 6 +++--- include/CXXGraph/Node/Node.h | 6 +++--- include/CXXGraph/Node/Node_decl.h | 6 +++--- 15 files changed, 48 insertions(+), 46 deletions(-) diff --git a/include/CXXGraph/CXXGraphConfig.h b/include/CXXGraph/CXXGraphConfig.h index f6ff9ff4..44cfc71d 100644 --- a/include/CXXGraph/CXXGraphConfig.h +++ b/include/CXXGraph/CXXGraphConfig.h @@ -1,4 +1,4 @@ -// the configured options and settings for CXXGraph -#define CXXGraph_VERSION_MAJOR 4 -#define CXXGraph_VERSION_MINOR 1 -#define CXXGraph_VERSION_PATCH 0 +// the configured options and settings for CXXGraph +#define CXXGraph_VERSION_MAJOR 4 +#define CXXGraph_VERSION_MINOR 1 +#define CXXGraph_VERSION_PATCH 0 diff --git a/include/CXXGraph/Edge/DirectedWeightedEdge.h b/include/CXXGraph/Edge/DirectedWeightedEdge.h index e8a05bf1..2a8bb362 100755 --- a/include/CXXGraph/Edge/DirectedWeightedEdge.h +++ b/include/CXXGraph/Edge/DirectedWeightedEdge.h @@ -16,11 +16,11 @@ /***********************************************************/ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__ -#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__ +#ifndef CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_ +#define CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_ #pragma once #include "DirectedWeightedEdge_impl.hpp" -#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__ +#endif // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_ diff --git a/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h b/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h index 6e3622fc..e456c8ab 100644 --- a/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h +++ b/include/CXXGraph/Edge/DirectedWeightedEdge_decl.h @@ -16,8 +16,8 @@ /***********************************************************/ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__ -#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__ +#ifndef CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_ +#define CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_ #pragma once @@ -76,4 +76,4 @@ class DirectedWeightedEdge : public DirectedEdge, public Weighted { } // namespace CXXGraph -#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__ +#endif // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_ diff --git a/include/CXXGraph/Edge/Edge.h b/include/CXXGraph/Edge/Edge.h index 7b18abc1..327949c8 100755 --- a/include/CXXGraph/Edge/Edge.h +++ b/include/CXXGraph/Edge/Edge.h @@ -17,11 +17,11 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_EDGE_H__ -#define __CXXGRAPH_EDGE_H__ +#ifndef CXXGRAPH_EDGE_H_ +#define CXXGRAPH_EDGE_H_ #pragma once #include "CXXGraph/Edge/Edge_impl.hpp" -#endif // __CXXGRAPH_EDGE_H__ +#endif // CXXGRAPH_EDGE_H_ diff --git a/include/CXXGraph/Edge/Edge_decl.h b/include/CXXGraph/Edge/Edge_decl.h index 3be7b185..11d90d88 100644 --- a/include/CXXGraph/Edge/Edge_decl.h +++ b/include/CXXGraph/Edge/Edge_decl.h @@ -17,8 +17,8 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_EDGE_DECL_H__ -#define __CXXGRAPH_EDGE_DECL_H__ +#ifndef CXXGRAPH_EDGE_DECL_H_ +#define CXXGRAPH_EDGE_DECL_H_ #pragma once @@ -74,4 +74,4 @@ class Edge { } // namespace CXXGraph -#endif // __CXXGRAPH_EDGE_DECL_H__ +#endif // CXXGRAPH_EDGE_DECL_H_ diff --git a/include/CXXGraph/Edge/UndirectedEdge.h b/include/CXXGraph/Edge/UndirectedEdge.h index 858b3aae..f4f4b37a 100755 --- a/include/CXXGraph/Edge/UndirectedEdge.h +++ b/include/CXXGraph/Edge/UndirectedEdge.h @@ -17,11 +17,11 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_UNDIRECTEDEDGE_H__ -#define __CXXGRAPH_UNDIRECTEDEDGE_H__ +#ifndef CXXGRAPH_UNDIRECTEDEDGE_H_ +#define CXXGRAPH_UNDIRECTEDEDGE_H_ #pragma once #include "UndirectedEdge_impl.hpp" -#endif // __CXXGRAPH_UNDIRECTEDEDGE_H__ +#endif // CXXGRAPH_UNDIRECTEDEDGE_H_ diff --git a/include/CXXGraph/Edge/UndirectedEdge_decl.h b/include/CXXGraph/Edge/UndirectedEdge_decl.h index a2371113..42bc780a 100644 --- a/include/CXXGraph/Edge/UndirectedEdge_decl.h +++ b/include/CXXGraph/Edge/UndirectedEdge_decl.h @@ -17,8 +17,8 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__ -#define __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__ +#ifndef CXXGRAPH_UNDIRECTEDEDGE_DECL_H_ +#define CXXGRAPH_UNDIRECTEDEDGE_DECL_H_ #pragma once @@ -67,4 +67,4 @@ class UndirectedEdge : public Edge { } // namespace CXXGraph -#endif // __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__ +#endif // CXXGRAPH_UNDIRECTEDEDGE_DECL_H_ diff --git a/include/CXXGraph/Edge/UndirectedWeightedEdge.h b/include/CXXGraph/Edge/UndirectedWeightedEdge.h index 03b3e05a..cf78de2a 100755 --- a/include/CXXGraph/Edge/UndirectedWeightedEdge.h +++ b/include/CXXGraph/Edge/UndirectedWeightedEdge.h @@ -17,11 +17,11 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__ -#define __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__ +#ifndef CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H_ +#define CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H_ #pragma once #include "UndirectedWeightedEdge_impl.hpp" -#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__ +#endif // CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H_ diff --git a/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h b/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h index e35ef3d4..d0c142a5 100644 --- a/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h +++ b/include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h @@ -17,8 +17,8 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__ -#define __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__ +#ifndef CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_ +#define CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_ #pragma once @@ -78,4 +78,4 @@ class UndirectedWeightedEdge : public UndirectedEdge, public Weighted { } // namespace CXXGraph -#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__ +#endif // CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_ diff --git a/include/CXXGraph/Edge/Weighted.h b/include/CXXGraph/Edge/Weighted.h index 8b889a5d..5d6611a5 100755 --- a/include/CXXGraph/Edge/Weighted.h +++ b/include/CXXGraph/Edge/Weighted.h @@ -17,11 +17,11 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_WEIGHTED_H__ -#define __CXXGRAPH_WEIGHTED_H__ +#ifndef CXXGRAPH_WEIGHTED_H_ +#define CXXGRAPH_WEIGHTED_H_ #pragma once #include "Weighted_impl.hpp" -#endif // __CXXGRAPH_WEIGHTED_H__ \ No newline at end of file +#endif // CXXGRAPH_WEIGHTED_H_ \ No newline at end of file diff --git a/include/CXXGraph/Edge/Weighted_decl.h b/include/CXXGraph/Edge/Weighted_decl.h index 2cba9ee2..6d6f9708 100644 --- a/include/CXXGraph/Edge/Weighted_decl.h +++ b/include/CXXGraph/Edge/Weighted_decl.h @@ -17,8 +17,8 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_WEIGHTED_DECL_H__ -#define __CXXGRAPH_WEIGHTED_DECL_H__ +#ifndef CXXGRAPH_WEIGHTED_DECL_H_ +#define CXXGRAPH_WEIGHTED_DECL_H_ #pragma once @@ -36,4 +36,4 @@ class Weighted { }; } // namespace CXXGraph -#endif // __CXXGRAPH_WEIGHTED_DECL_H__ \ No newline at end of file +#endif // CXXGRAPH_WEIGHTED_DECL_H_ \ No newline at end of file diff --git a/include/CXXGraph/Graph/Graph.h b/include/CXXGraph/Graph/Graph.h index c942f02a..277953b9 100644 --- a/include/CXXGraph/Graph/Graph.h +++ b/include/CXXGraph/Graph/Graph.h @@ -17,8 +17,10 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_GRAPH_H__ -#define __CXXGRAPH_GRAPH_H__ +#ifndef CXXGRAPH_GRAPH_H_ +#define CXXGRAPH_GRAPH_H_ + +#pragma once #include "CXXGraph/Graph/Graph_impl.hpp" @@ -49,4 +51,4 @@ #include "CXXGraph/Graph/IO/InputOperation_impl.hpp" #include "CXXGraph/Graph/IO/OutputOperation_impl.hpp" -#endif // __CXXGRAPH_GRAPH_H__ +#endif // CXXGRAPH_GRAPH_H_ diff --git a/include/CXXGraph/Graph/Graph_decl.h b/include/CXXGraph/Graph/Graph_decl.h index 35fe6690..6c70e961 100644 --- a/include/CXXGraph/Graph/Graph_decl.h +++ b/include/CXXGraph/Graph/Graph_decl.h @@ -17,8 +17,8 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_GRAPH_DECL_H__ -#define __CXXGRAPH_GRAPH_DECL_H__ +#ifndef CXXGRAPH_GRAPH_DECL_H_ +#define CXXGRAPH_GRAPH_DECL_H_ #pragma once @@ -1028,4 +1028,4 @@ class Graph { }; } // namespace CXXGraph -#endif // __CXXGRAPH_GRAPH_DECL_H__ +#endif // CXXGRAPH_GRAPH_DECL_H_ diff --git a/include/CXXGraph/Node/Node.h b/include/CXXGraph/Node/Node.h index 96fa0687..da17f653 100755 --- a/include/CXXGraph/Node/Node.h +++ b/include/CXXGraph/Node/Node.h @@ -17,11 +17,11 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_NODE_H__ -#define __CXXGRAPH_NODE_H__ +#ifndef CXXGRAPH_NODE_H_ +#define CXXGRAPH_NODE_H_ #pragma once #include "Node_impl.hpp" -#endif // __CXXGRAPH_NODE_H__ +#endif // CXXGRAPH_NODE_H_ diff --git a/include/CXXGraph/Node/Node_decl.h b/include/CXXGraph/Node/Node_decl.h index d8650894..78a43e33 100644 --- a/include/CXXGraph/Node/Node_decl.h +++ b/include/CXXGraph/Node/Node_decl.h @@ -17,8 +17,8 @@ /*** License: MPL v2.0 ***/ /***********************************************************/ -#ifndef __CXXGRAPH_NODE_DECL_H__ -#define __CXXGRAPH_NODE_DECL_H__ +#ifndef CXXGRAPH_NODE_DECL_H_ +#define CXXGRAPH_NODE_DECL_H_ #pragma once #include @@ -57,4 +57,4 @@ class Node { } // namespace CXXGraph -#endif // __CXXGRAPH_NODE_DECL_H__ +#endif // CXXGRAPH_NODE_DECL_H_