Skip to content

Commit b00315a

Browse files
committed
header guard conflicts
1 parent 41e1160 commit b00315a

File tree

13 files changed

+26
-26
lines changed

13 files changed

+26
-26
lines changed

include/maxplus/algebra/mptype.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
* SOFTWARE.
4242
*/
4343

44-
#ifndef BASE_MAXPLUS_MPTYPE_H_INCLUDED
45-
#define BASE_MAXPLUS_MPTYPE_H_INCLUDED
44+
#ifndef MAXPLUS_ALGEBRA_MPTYPE_H
45+
#define MAXPLUS_ALGEBRA_MPTYPE_H
4646

4747
#include "maxplus/base/basic_types.h"
4848
#include "maxplus/base/string/cstring.h"

include/maxplus/base/analysis/mcm/mcm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
* SOFTWARE.
4343
*/
4444

45-
#ifndef BASE_ANALYSIS_MCM_MCM_H_INCLUDED
46-
#define BASE_ANALYSIS_MCM_MCM_H_INCLUDED
45+
#ifndef MAXPLUS_BASE_ANALYSIS_MCM_MCM_H_INCLUDED
46+
#define MAXPLUS_BASE_ANALYSIS_MCM_MCM_H_INCLUDED
4747

4848
#include "maxplus/base/analysis/mcm/mcmgraph.h"
4949

include/maxplus/base/analysis/mcm/mcmdg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
* SOFTWARE.
4949
*/
5050

51-
#ifndef BASE_ANALYSIS_MCM_MCMDG_H_INCLUDED
52-
#define BASE_ANALYSIS_MCM_MCMDG_H_INCLUDED
51+
#ifndef MAXPLUS_BASE_ANALYSIS_MCM_MCMDG_H_INCLUDED
52+
#define MAXPLUS_BASE_ANALYSIS_MCM_MCMDG_H_INCLUDED
5353

5454
#include "maxplus/base/analysis/mcm/mcmgraph.h"
5555

include/maxplus/base/analysis/mcm/mcmgraph.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
* SOFTWARE.
4040
*/
4141

42-
#ifndef BASE_ANALYSIS_MCM_MCMGRAPH_H_INCLUDED
43-
#define BASE_ANALYSIS_MCM_MCMGRAPH_H_INCLUDED
42+
#ifndef MAXPLUS_BASE_ANALYSIS_MCM_MCMGRAPH_H_INCLUDED
43+
#define MAXPLUS_BASE_ANALYSIS_MCM_MCMGRAPH_H_INCLUDED
4444

4545
#include "maxplus/base/basic_types.h"
4646
#include <memory>

include/maxplus/base/analysis/mcm/mcmhoward.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
* SOFTWARE.
5050
*/
5151

52-
#ifndef BASE_ANALYSIS_MCM_MCMHOWARD_H_INCLUDED
53-
#define BASE_ANALYSIS_MCM_MCMHOWARD_H_INCLUDED
52+
#ifndef MAXPLUS_BASE_ANALYSIS_MCM_MCMHOWARD_H_INCLUDED
53+
#define MAXPLUS_BASE_ANALYSIS_MCM_MCMHOWARD_H_INCLUDED
5454

5555
#include "maxplus/base/analysis/mcm/mcmgraph.h"
5656
#include <memory>

include/maxplus/base/analysis/mcm/mcmyto.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
* SOFTWARE.
4646
*/
4747

48-
#ifndef BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
49-
#define BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
48+
#ifndef MAXPLUS_BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
49+
#define MAXPLUS_BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
5050

5151
#include "maxplus/base/analysis/mcm/mcmgraph.h"
5252
#include <cstdint>

include/maxplus/base/base.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
* SOFTWARE.
4040
*/
4141

42-
#ifndef BASE_BASE_H_INCLUDED
43-
#define BASE_BASE_H_INCLUDED
42+
#ifndef MAXPLUS_BASE_BASE_H_INCLUDED
43+
#define MAXPLUS_BASE_BASE_H_INCLUDED
4444

4545
/* Exception and assertion */
4646
#include "exception/exception.h"

include/maxplus/base/basic_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
* SOFTWARE.
4040
*/
4141

42-
#ifndef BASE_BASIC_TYPES_H_INCLUDED
43-
#define BASE_BASIC_TYPES_H_INCLUDED
42+
#ifndef MAXPLUS_BASE_BASIC_TYPES_H_INCLUDED
43+
#define MAXPLUS_BASE_BASIC_TYPES_H_INCLUDED
4444

4545
#include <cassert>
4646
#include <cfloat>

include/maxplus/base/fraction/fraction.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
* SOFTWARE.
3939
*/
4040

41-
#ifndef BASE_FRACTION_FRACTION_H
42-
#define BASE_FRACTION_FRACTION_H
41+
#ifndef MAXPLUS_BASE_FRACTION_FRACTION_H
42+
#define MAXPLUS_BASE_FRACTION_FRACTION_H
4343

4444
#include "../basic_types.h"
4545
#include "../math/cmath.h"

include/maxplus/base/math/cmath.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
* SOFTWARE.
3939
*/
4040

41-
#ifndef BASE_MATH_CMATH_H
42-
#define BASE_MATH_CMATH_H
41+
#ifndef MAXPLUS_BASE_MATH_CMATH_H
42+
#define MAXPLUS_BASE_MATH_CMATH_H
4343

4444
#include <cmath>
4545

0 commit comments

Comments
 (0)