Adding library name (CXXGRAPH) in header guards to avoid possible conflicts in include folders Node and Graph (#117)

AlfredCP · Parrot User · web-flow · commit 241cf7330a0c · 2021-10-18T00:20:39.000+02:00
* Adding library name (CXXGRAPH) in header guards to avoid possible conflicts in include folders Node and Graph

* Adding library name (CXXGRAPH) in header guards to avoid possible conflicts in include folders Edge, Partitioning and Utility

Co-authored-by: Parrot User &lt;user@localhost.localdomain&gt;
diff --git a/include/Edge/DirectedEdge.hpp b/include/Edge/DirectedEdge.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __DIRECTEDEDGE_H__
-#define __DIRECTEDEDGE_H__
+#ifndef __CXXGRAPH_DIRECTEDEDGE_H__
+#define __CXXGRAPH_DIRECTEDEDGE_H__
 
 #pragma once
 
@@ -101,4 +101,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __DIRECTEDEDGE_H__
+#endif // __CXXGRAPH_DIRECTEDEDGE_H__
diff --git a/include/Edge/DirectedWeightedEdge.hpp b/include/Edge/DirectedWeightedEdge.hpp
@@ -16,8 +16,8 @@
 /***********************************************************/
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
-#ifndef __DIRECTEDWEIGHTEDEDGE_H__
-#define __DIRECTEDWEIGHTEDEDGE_H__
+#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
+#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
 
 #pragma once
 
@@ -106,4 +106,4 @@ namespace CXXGRAPH
 
 }
 
-#endif // __DIRECTEDWEIGHTEDEDGE_H__
+#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
diff --git a/include/Edge/Edge.hpp b/include/Edge/Edge.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __EDGE_H__
-#define __EDGE_H__
+#ifndef __CXXGRAPH_EDGE_H__
+#define __CXXGRAPH_EDGE_H__
 
 #pragma once
 
@@ -114,4 +114,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __EDGE_H__
+#endif // __CXXGRAPH_EDGE_H__
diff --git a/include/Edge/UndirectedEdge.hpp b/include/Edge/UndirectedEdge.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __UNDIRECTEDEDGE_H__
-#define __UNDIRECTEDEDGE_H__
+#ifndef __CXXGRAPH_UNDIRECTEDEDGE_H__
+#define __CXXGRAPH_UNDIRECTEDEDGE_H__
 
 #pragma once
 
@@ -100,4 +100,4 @@ namespace CXXGRAPH
 }
 
 
-#endif // __UNDIRECTEDEDGE_H__
+#endif // __CXXGRAPH_UNDIRECTEDEDGE_H__
diff --git a/include/Edge/UndirectedWeightedEdge.hpp b/include/Edge/UndirectedWeightedEdge.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __UNDIRECTEDWEIGHTEDEDGE_H__
-#define __UNDIRECTEDWEIGHTEDEDGE_H__
+#ifndef __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
+#define __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
 
 #pragma once
 
@@ -107,4 +107,4 @@ namespace CXXGRAPH
 
 }
 
-#endif // __UNDIRECTEDWEIGHTEDEDGE_H__
+#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
diff --git a/include/Edge/Weighted.hpp b/include/Edge/Weighted.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __WEIGHTED_H__
-#define __WEIGHTED_H__
+#ifndef __CXXGRAPH_WEIGHTED_H__
+#define __CXXGRAPH_WEIGHTED_H__
 
 #pragma once
 
@@ -64,4 +64,4 @@ namespace CXXGRAPH
 }
 
 
-#endif // __WEIGHTED_H__
+#endif // __CXXGRAPH_WEIGHTED_H__
diff --git a/include/Graph/Graph.hpp b/include/Graph/Graph.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __GRAPH_H__
-#define __GRAPH_H__
+#ifndef __CXXGRAPH_GRAPH_H__
+#define __CXXGRAPH_GRAPH_H__
 
 #pragma once
 
@@ -2108,4 +2108,4 @@ namespace CXXGRAPH
 	}
 
 } // namespace CXXGRAPH
-#endif // __GRAPH_H__
+#endif // __CXXGRAPH_GRAPH_H__
diff --git a/include/Graph/Graph_TS.hpp b/include/Graph/Graph_TS.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __GRAPH_TS_H__
-#define __GRAPH_TS_H__
+#ifndef __CXXGRAPH_GRAPH_TS_H__
+#define __CXXGRAPH_GRAPH_TS_H__
 
 #pragma once
 
@@ -429,4 +429,4 @@ namespace CXXGRAPH
         return partitions;
     }
 }
-#endif // __GRAPH_TS_H__
+#endif // __CXXGRAPH_GRAPH_TS_H__
diff --git a/include/Node/Node.hpp b/include/Node/Node.hpp
@@ -18,8 +18,8 @@
 /***********************************************************/
 
 
-#ifndef __NODE_H__
-#define __NODE_H__
+#ifndef __CXXGRAPH_NODE_H__
+#define __CXXGRAPH_NODE_H__
 
 #pragma once
 #include <iostream>
@@ -90,4 +90,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __NODE_H__
+#endif // __CXXGRAPH_NODE_H__
diff --git a/include/Partitioning/Partition.hpp b/include/Partitioning/Partition.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __PARTITION_H__
-#define __PARTITION_H__
+#ifndef __CXXGRAPH_PARTITION_H__
+#define __CXXGRAPH_PARTITION_H__
 
 #pragma once
 
@@ -366,4 +366,4 @@ namespace CXXGRAPH
 
 }
 
-#endif // __PARTITION_H__
+#endif // __CXXGRAPH_PARTITION_H__
diff --git a/include/Partitioning/PartitioningStats.hpp b/include/Partitioning/PartitioningStats.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __PARTITIONINGSTATS_H__
-#define __PARTITIONINGSTATS_H__
+#ifndef __CXXGRAPH_PARTITIONINGSTATS_H__
+#define __CXXGRAPH_PARTITIONINGSTATS_H__
 
 #include <iostream>
 #include "Utility/Typedef.hpp"
@@ -66,4 +66,4 @@ namespace CXXGRAPH
 
 }
 
-#endif // __PARTITIONINGSTATS_H__
+#endif // __CXXGRAPH_PARTITIONINGSTATS_H__
diff --git a/include/Utility/ConstString.hpp b/include/Utility/ConstString.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __CONSTSTRING_H__
-#define __CONSTSTRING_H__
+#ifndef __CXXGRAPH_CONSTSTRING_H__
+#define __CXXGRAPH_CONSTSTRING_H__
 
 #pragma once
 
@@ -33,4 +33,4 @@ namespace CXXGRAPH
 	constexpr char ERR_SOURCE_NODE_NOT_IN_GRAPH[] = "Source Node not inside Graph";
 	///////////////////////////////
 }
-#endif // __CONSTSTRING_H__
+#endif // __CXXGRAPH_CONSTSTRING_H__
diff --git a/include/Utility/ConstValue.hpp b/include/Utility/ConstValue.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __CONSTVALUE_H__
-#define __CONSTVALUE_H__
+#ifndef __CXXGRAPH_CONSTVALUE_H__
+#define __CXXGRAPH_CONSTVALUE_H__
 
 #pragma once
 
@@ -29,4 +29,4 @@ namespace CXXGRAPH
     constexpr double INF_DOUBLE = std::numeric_limits<double>::max();
 }
 
-#endif // __CONSTVALUE_H__
+#endif // __CXXGRAPH_CONSTVALUE_H__
diff --git a/include/Utility/Reader.hpp b/include/Utility/Reader.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __READER_H__
-#define __READER_H__
+#ifndef __CXXGRAPH_READER_H__
+#define __CXXGRAPH_READER_H__
 
 #pragma once   // This is to make sure that this header is only included once
 
@@ -43,4 +43,4 @@ namespace CXXGRAPH
 	};
 }
 
-#endif // __READER_H__
+#endif // __CXXGRAPH_READER_H__
diff --git a/include/Utility/ThreadSafe.hpp b/include/Utility/ThreadSafe.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __THREADSAFE_H__
-#define __THREADSAFE_H__
+#ifndef __CXXGRAPH_THREADSAFE_H__
+#define __CXXGRAPH_THREADSAFE_H__
 
 #pragma once
 
@@ -47,4 +47,4 @@ namespace CXXGRAPH
 	}
 }
 
-#endif // __THREADSAFE_H__
+#endif // __CXXGRAPH_THREADSAFE_H__
diff --git a/include/Utility/Writer.hpp b/include/Utility/Writer.hpp
@@ -17,8 +17,8 @@
 /***	 License: AGPL v3.0							     ***/
 /***********************************************************/
 
-#ifndef __WRITER_H__
-#define __WRITER_H__
+#ifndef __CXXGRAPH_WRITER_H__
+#define __CXXGRAPH_WRITER_H__
 
 #pragma once   // This is to make sure that this header is only included once
 
@@ -49,4 +49,4 @@ namespace CXXGRAPH
 	};
 }
 
-#endif // __WRITER_H__
+#endif // __CXXGRAPH_WRITER_H__

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`/* License: AGPL v3.0 */`
`18`	`18`	`/***********************************************************/`
`19`	`19`
`20`		`-#ifndef __DIRECTEDEDGE_H__`
`21`		`-#define __DIRECTEDEDGE_H__`
	`20`	`+#ifndef __CXXGRAPH_DIRECTEDEDGE_H__`
	`21`	`+#define __CXXGRAPH_DIRECTEDEDGE_H__`
`22`	`22`
`23`	`23`	`#pragma once`
`24`	`24`
`@@ -101,4 +101,4 @@ namespace CXXGRAPH`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-#endif // __DIRECTEDEDGE_H__`
	`104`	`+#endif // __CXXGRAPH_DIRECTEDEDGE_H__`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`	`/***********************************************************/`
`19`	`19`
`20`	`20`
`21`		`-#ifndef __NODE_H__`
`22`		`-#define __NODE_H__`
	`21`	`+#ifndef __CXXGRAPH_NODE_H__`
	`22`	`+#define __CXXGRAPH_NODE_H__`
`23`	`23`
`24`	`24`	`#pragma once`
`25`	`25`	`#include <iostream>`
`@@ -90,4 +90,4 @@ namespace CXXGRAPH`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`-#endif // __NODE_H__`
	`93`	`+#endif // __CXXGRAPH_NODE_H__`