Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ZigRazor authored Feb 3, 2025
2 parents ca8bf72 + 1e6b0ce commit 9e6137b
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 49 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: CMake

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
Expand Down
8 changes: 4 additions & 4 deletions include/CXXGraph/CXXGraphConfig.h
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/DirectedWeightedEdge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/DirectedWeightedEdge_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

} // namespace CXXGraph

#endif // __CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H__
#endif // CXXGRAPH_DIRECTEDWEIGHTEDEDGE_DECL_H_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/Edge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/Edge_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -74,4 +74,4 @@ class Edge {

} // namespace CXXGraph

#endif // __CXXGRAPH_EDGE_DECL_H__
#endif // CXXGRAPH_EDGE_DECL_H_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/UndirectedEdge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/UndirectedEdge_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -67,4 +67,4 @@ class UndirectedEdge : public Edge<T> {

} // namespace CXXGraph

#endif // __CXXGRAPH_UNDIRECTEDEDGE_DECL_H__
#endif // CXXGRAPH_UNDIRECTEDEDGE_DECL_H_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/UndirectedWeightedEdge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/UndirectedWeightedEdge_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

} // namespace CXXGraph

#endif // __CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H__
#endif // CXXGRAPH_UNDIRECTEDWEIGHTEDEDGE_DECL_H_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/Weighted.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__
#endif // CXXGRAPH_WEIGHTED_H_
6 changes: 3 additions & 3 deletions include/CXXGraph/Edge/Weighted_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -36,4 +36,4 @@ class Weighted {
};
} // namespace CXXGraph

#endif // __CXXGRAPH_WEIGHTED_DECL_H__
#endif // CXXGRAPH_WEIGHTED_DECL_H_
8 changes: 5 additions & 3 deletions include/CXXGraph/Graph/Graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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_
6 changes: 3 additions & 3 deletions include/CXXGraph/Graph/Graph_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -1028,4 +1028,4 @@ class Graph {
};

} // namespace CXXGraph
#endif // __CXXGRAPH_GRAPH_DECL_H__
#endif // CXXGRAPH_GRAPH_DECL_H_
6 changes: 3 additions & 3 deletions include/CXXGraph/Node/Node.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_
8 changes: 4 additions & 4 deletions include/CXXGraph/Node/Node_decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <iostream>
Expand All @@ -43,7 +43,7 @@ class Node {

Node(const std::string &, const T &data);
// Move constructor
Node(const std::string &, T &&data) noexcept;
explicit Node(const std::string &, T &&data) noexcept;
~Node() = default;
const CXXGraph::id_t &getId() const;
const std::string &getUserId() const;
Expand All @@ -57,4 +57,4 @@ class Node {

} // namespace CXXGraph

#endif // __CXXGRAPH_NODE_DECL_H__
#endif // CXXGRAPH_NODE_DECL_H_

0 comments on commit 9e6137b

Please sign in to comment.