Skip to content

Commit 3304ec8

Browse files
Fix windows header macro leakage
1 parent dfb0085 commit 3304ec8

File tree

12 files changed

+46
-6
lines changed

12 files changed

+46
-6
lines changed

Include/Tests/BuildsManager/MockComponents.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef RUNCPP2_UNIT_TESTS_BUILDS_MANAGER_MOCK_COMPONENTS_HPP
22
#define RUNCPP2_UNIT_TESTS_BUILDS_MANAGER_MOCK_COMPONENTS_HPP
33

4+
#if !defined(NOMINMAX)
5+
#define NOMINMAX 1
6+
#endif
47
#include "ghc/filesystem.hpp"
58

69
#include "CppOverride.hpp"

Include/Tests/IncludeManager/MockComponents.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef RUNCPP2_UNIT_TESTS_INCLUDE_MANAGER_MOCK_COMPONENTS_HPP
22
#define RUNCPP2_UNIT_TESTS_INCLUDE_MANAGER_MOCK_COMPONENTS_HPP
33

4+
#if !defined(NOMINMAX)
5+
#define NOMINMAX 1
6+
#endif
47
#include "ghc/filesystem.hpp"
58
#include "CppOverride.hpp"
69

@@ -104,4 +107,4 @@ namespace std
104107
#undef getline
105108
#endif
106109

107-
#endif
110+
#endif

Include/runcpp2/BuildsManager.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef RUNCPP2_BUILDS_MANAGER_HPP
22
#define RUNCPP2_BUILDS_MANAGER_HPP
33

4+
#if !defined(NOMINMAX)
5+
#define NOMINMAX 1
6+
#endif
47
#include "ghc/filesystem.hpp"
58

69
#include <unordered_map>

Include/runcpp2/CompilingLinking.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include "runcpp2/Data/Profile.hpp"
55
#include "runcpp2/Data/ScriptInfo.hpp"
66

7+
#if !defined(NOMINMAX)
8+
#define NOMINMAX 1
9+
#endif
10+
711
#include "ghc/filesystem.hpp"
812

913
#include <string>

Include/runcpp2/Data/ProfilesProcessPaths.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55

66
#include "runcpp2/YamlLib.hpp"
77

8-
#define NOMINMAX 1
8+
#if !defined(NOMINMAX)
9+
#define NOMINMAX 1
10+
#endif
911
#include "ghc/filesystem.hpp"
1012

1113
#include <unordered_map>

Include/runcpp2/Data/ScriptInfo.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
#ifndef RUNCPP2_DATA_SCRIPT_INFO_HPP
22
#define RUNCPP2_DATA_SCRIPT_INFO_HPP
33

4+
45
#include "runcpp2/Data/DependencyInfo.hpp"
56
#include "runcpp2/Data/ProfilesFlagsOverride.hpp"
6-
#include "runcpp2/Data/ParseCommon.hpp"
77
#include "runcpp2/Data/ProfilesProcessPaths.hpp"
88
#include "runcpp2/Data/ProfilesDefines.hpp"
99
#include "runcpp2/Data/ProfilesCommands.hpp"
10+
11+
#if !defined(NOMINMAX)
12+
#define NOMINMAX 1
13+
#endif
14+
1015
#include "ghc/filesystem.hpp"
1116

1217
#include <string>

Include/runcpp2/DependenciesHelper.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
#include "runcpp2/Data/ScriptInfo.hpp"
66
#include "runcpp2/Data/Profile.hpp"
77

8+
#if !defined(NOMINMAX)
9+
#define NOMINMAX 1
10+
#endif
11+
812
#include "ghc/filesystem.hpp"
913
#include <vector>
1014

Include/runcpp2/IncludeManager.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#ifndef RUNCPP2_INCLUDE_MANAGER_HPP
22
#define RUNCPP2_INCLUDE_MANAGER_HPP
33

4+
#if !defined(NOMINMAX)
5+
#define NOMINMAX 1
6+
#endif
7+
48
#include "ghc/filesystem.hpp"
59
#include <unordered_map>
610
#include <vector>
@@ -41,4 +45,4 @@ namespace runcpp2
4145
};
4246
}
4347

44-
#endif
48+
#endif

Include/runcpp2/PipelineSteps.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#include "runcpp2/BuildsManager.hpp"
1111
#include "runcpp2/IncludeManager.hpp"
1212

13+
#if !defined(NOMINMAX)
14+
#define NOMINMAX 1
15+
#endif
1316
#include "ghc/filesystem.hpp"
1417

1518
#include <string>
@@ -130,5 +133,4 @@ namespace runcpp2
130133
SourceIncludeMap& outSourceIncludes);
131134
}
132135

133-
134136
#endif

Include/runcpp2/PlatformUtil.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
#include "runcpp2/Data/ParseCommon.hpp"
55
#include "runcpp2/Data/Profile.hpp"
6+
7+
#if !defined(NOMINMAX)
8+
#define NOMINMAX 1
9+
#endif
10+
611
#include "System2.h"
712

813
#include <cstdint>

0 commit comments

Comments
 (0)