Skip to content

Commit 9e6137b

Browse files
authored
Merge branch 'master' into master
2 parents ca8bf72 + 1e6b0ce commit 9e6137b

16 files changed

+49
-49
lines changed

.github/workflows/cmake.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: CMake
22

33
on:
44
push:
5-
branches: [ master ]
65
pull_request:
7-
branches: [ master ]
86
env:
97
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
108
BUILD_TYPE: Release

include/CXXGraph/CXXGraphConfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// the configured options and settings for CXXGraph
2-
#define CXXGraph_VERSION_MAJOR 4
3-
#define CXXGraph_VERSION_MINOR 1
4-
#define CXXGraph_VERSION_PATCH 0
1+
// the configured options and settings for CXXGraph
2+
#define CXXGraph_VERSION_MAJOR 4
3+
#define CXXGraph_VERSION_MINOR 1
4+
#define CXXGraph_VERSION_PATCH 0

include/CXXGraph/Edge/DirectedWeightedEdge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
/***********************************************************/
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
19-
#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
20-
#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
19+
#ifndef CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_
20+
#define CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_
2121

2222
#pragma once
2323

2424
#include "DirectedWeightedEdge_impl.hpp"
2525

26-
#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H__
26+
#endif // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_H_

include/CXXGraph/Edge/DirectedWeightedEdge_decl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
/***********************************************************/
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
19-
#ifndef __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
20-
#define __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
19+
#ifndef CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_
20+
#define CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_
2121

2222
#pragma once
2323

@@ -76,4 +76,4 @@ class DirectedWeightedEdge : public DirectedEdge<T>, public Weighted {
7676

7777
} // namespace CXXGraph
7878

79-
#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
79+
#endif // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_

include/CXXGraph/Edge/Edge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
1919

20-
#ifndef __CXXGRAPH_EDGE_H__
21-
#define __CXXGRAPH_EDGE_H__
20+
#ifndef CXXGRAPH_EDGE_H_
21+
#define CXXGRAPH_EDGE_H_
2222

2323
#pragma once
2424

2525
#include "CXXGraph/Edge/Edge_impl.hpp"
2626

27-
#endif // __CXXGRAPH_EDGE_H__
27+
#endif // CXXGRAPH_EDGE_H_

include/CXXGraph/Edge/Edge_decl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
1919

20-
#ifndef __CXXGRAPH_EDGE_DECL_H__
21-
#define __CXXGRAPH_EDGE_DECL_H__
20+
#ifndef CXXGRAPH_EDGE_DECL_H_
21+
#define CXXGRAPH_EDGE_DECL_H_
2222

2323
#pragma once
2424

@@ -74,4 +74,4 @@ class Edge {
7474

7575
} // namespace CXXGraph
7676

77-
#endif // __CXXGRAPH_EDGE_DECL_H__
77+
#endif // CXXGRAPH_EDGE_DECL_H_

include/CXXGraph/Edge/UndirectedEdge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
1919

20-
#ifndef __CXXGRAPH_UNDIRECTEDEDGE_H__
21-
#define __CXXGRAPH_UNDIRECTEDEDGE_H__
20+
#ifndef CXXGRAPH_UNDIRECTEDEDGE_H_
21+
#define CXXGRAPH_UNDIRECTEDEDGE_H_
2222

2323
#pragma once
2424

2525
#include "UndirectedEdge_impl.hpp"
2626

27-
#endif // __CXXGRAPH_UNDIRECTEDEDGE_H__
27+
#endif // CXXGRAPH_UNDIRECTEDEDGE_H_

include/CXXGraph/Edge/UndirectedEdge_decl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
1919

20-
#ifndef __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__
21-
#define __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__
20+
#ifndef CXXGRAPH_UNDIRECTEDEDGE_DECL_H_
21+
#define CXXGRAPH_UNDIRECTEDEDGE_DECL_H_
2222

2323
#pragma once
2424

@@ -67,4 +67,4 @@ class UndirectedEdge : public Edge<T> {
6767

6868
} // namespace CXXGraph
6969

70-
#endif // __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__
70+
#endif // CXXGRAPH_UNDIRECTEDEDGE_DECL_H_

include/CXXGraph/Edge/UndirectedWeightedEdge.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
1919

20-
#ifndef __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
21-
#define __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
20+
#ifndef CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H_
21+
#define CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H_
2222

2323
#pragma once
2424

2525
#include "UndirectedWeightedEdge_impl.hpp"
2626

27-
#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H__
27+
#endif // CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_H_

include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
/*** License: MPL v2.0 ***/
1818
/***********************************************************/
1919

20-
#ifndef __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__
21-
#define __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__
20+
#ifndef CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_
21+
#define CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_
2222

2323
#pragma once
2424

@@ -78,4 +78,4 @@ class UndirectedWeightedEdge : public UndirectedEdge<T>, public Weighted {
7878

7979
} // namespace CXXGraph
8080

81-
#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__
81+
#endif // CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_

0 commit comments

Comments
 (0)