Skip to content

Commit 803537f

Browse files
committed
Update main to output generated at cd82011
1 parent 7d7033e commit 803537f

35 files changed

+30
-214
lines changed

include/unit_system.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
#include "unit_system/constants.hpp"
88

99
//all of the conbinations that are generated
10-
#include "unit_system/combinations.hpp"
10+
#include "unit_system/combinations.hpp"

include/unit_system/acceleration.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
#include "unit_system/unit_t.hpp"
55

66

7-
87
#ifndef UNIT_SYSTEM_EXPORT_MACRO
98
#define UNIT_SYSTEM_EXPORT_MACRO
109
#endif
1110

12-
1311
namespace sakurajin{
1412
namespace unit_system{
1513
class UNIT_SYSTEM_EXPORT_MACRO acceleration : public unit_t<2011>{
@@ -20,10 +18,10 @@ namespace sakurajin{
2018
acceleration(long double val, long double mult);
2119
acceleration(long double val, long double mult, long double offset);
2220
};
23-
2421

2522
UNIT_SYSTEM_EXPORT_MACRO std::ostream& operator<<(std::ostream& os, const acceleration& t);
2623

24+
2725
inline namespace literals{
2826

2927

@@ -32,12 +30,10 @@ namespace sakurajin{
3230

3331

3432

35-
3633
UNIT_SYSTEM_EXPORT_MACRO acceleration operator "" _G(long double val);
3734
UNIT_SYSTEM_EXPORT_MACRO acceleration operator "" _G(unsigned long long int val);
3835

3936

40-
4137
}
4238

4339
}

include/unit_system/amount.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
#include "unit_system/unit_t.hpp"
55

66

7-
87
#ifndef UNIT_SYSTEM_EXPORT_MACRO
98
#define UNIT_SYSTEM_EXPORT_MACRO
109
#endif
1110

12-
1311
namespace sakurajin{
1412
namespace unit_system{
1513
class UNIT_SYSTEM_EXPORT_MACRO amount : public unit_t<5>{
@@ -20,10 +18,10 @@ namespace sakurajin{
2018
amount(long double val, long double mult);
2119
amount(long double val, long double mult, long double offset);
2220
};
23-
2421

2522
UNIT_SYSTEM_EXPORT_MACRO std::ostream& operator<<(std::ostream& os, const amount& t);
2623

24+
2725
inline namespace literals{
2826

2927

@@ -32,12 +30,10 @@ namespace sakurajin{
3230

3331

3432

35-
3633
UNIT_SYSTEM_EXPORT_MACRO amount operator "" _things(long double val);
3734
UNIT_SYSTEM_EXPORT_MACRO amount operator "" _things(unsigned long long int val);
3835

3936

40-
4137
}
4238

4339
}

include/unit_system/area.hpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
#include "unit_system/unit_t.hpp"
55

66

7-
87
#ifndef UNIT_SYSTEM_EXPORT_MACRO
98
#define UNIT_SYSTEM_EXPORT_MACRO
109
#endif
1110

12-
1311
namespace sakurajin{
1412
namespace unit_system{
1513
class UNIT_SYSTEM_EXPORT_MACRO area : public unit_t<22>{
@@ -20,10 +18,10 @@ namespace sakurajin{
2018
area(long double val, long double mult);
2119
area(long double val, long double mult, long double offset);
2220
};
23-
2421

2522
UNIT_SYSTEM_EXPORT_MACRO std::ostream& operator<<(std::ostream& os, const area& t);
2623

24+
2725
inline namespace literals{
2826

2927

@@ -32,42 +30,35 @@ namespace sakurajin{
3230

3331

3432

35-
3633
UNIT_SYSTEM_EXPORT_MACRO area operator "" _are(long double val);
3734
UNIT_SYSTEM_EXPORT_MACRO area operator "" _are(unsigned long long int val);
3835

3936

4037

41-
4238
UNIT_SYSTEM_EXPORT_MACRO area operator "" _hectare(long double val);
4339
UNIT_SYSTEM_EXPORT_MACRO area operator "" _hectare(unsigned long long int val);
4440

4541

4642

47-
4843
UNIT_SYSTEM_EXPORT_MACRO area operator "" _km2(long double val);
4944
UNIT_SYSTEM_EXPORT_MACRO area operator "" _km2(unsigned long long int val);
5045

5146

5247

53-
5448
UNIT_SYSTEM_EXPORT_MACRO area operator "" _mm2(long double val);
5549
UNIT_SYSTEM_EXPORT_MACRO area operator "" _mm2(unsigned long long int val);
5650

5751

5852

59-
6053
UNIT_SYSTEM_EXPORT_MACRO area operator "" _um2(long double val);
6154
UNIT_SYSTEM_EXPORT_MACRO area operator "" _um2(unsigned long long int val);
6255

6356

6457

65-
6658
UNIT_SYSTEM_EXPORT_MACRO area operator "" _nm2(long double val);
6759
UNIT_SYSTEM_EXPORT_MACRO area operator "" _nm2(unsigned long long int val);
6860

6961

70-
7162
}
7263

7364
}

include/unit_system/combinations.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
#pragma once
22

3-
43
#include "unit_system/units.hpp"
54

6-
7-
85
#ifndef UNIT_SYSTEM_EXPORT_MACRO
96
#define UNIT_SYSTEM_EXPORT_MACRO
107
#endif
118

12-
139
namespace sakurajin{
1410
namespace unit_system{
1511

include/unit_system/constants.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#pragma once
22

3-
43
#ifndef UNIT_SYSTEM_EXPORT_MACRO
54
#define UNIT_SYSTEM_EXPORT_MACRO
65
#endif
76

8-
97
namespace sakurajin{
108
namespace unit_system{
119
namespace constants{

include/unit_system/electric_current.hpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
#include "unit_system/unit_t.hpp"
55

66

7-
87
#ifndef UNIT_SYSTEM_EXPORT_MACRO
98
#define UNIT_SYSTEM_EXPORT_MACRO
109
#endif
1110

12-
1311
namespace sakurajin{
1412
namespace unit_system{
1513
class UNIT_SYSTEM_EXPORT_MACRO electric_current : public unit_t<6>{
@@ -20,10 +18,10 @@ namespace sakurajin{
2018
electric_current(long double val, long double mult);
2119
electric_current(long double val, long double mult, long double offset);
2220
};
23-
2421

2522
UNIT_SYSTEM_EXPORT_MACRO std::ostream& operator<<(std::ostream& os, const electric_current& t);
2623

24+
2725
inline namespace literals{
2826

2927

@@ -32,72 +30,60 @@ namespace sakurajin{
3230

3331

3432

35-
3633
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _PA(long double val);
3734
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _PA(unsigned long long int val);
3835

3936

4037

41-
4238
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _TA(long double val);
4339
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _TA(unsigned long long int val);
4440

4541

4642

47-
4843
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _GA(long double val);
4944
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _GA(unsigned long long int val);
5045

5146

5247

53-
5448
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _MA(long double val);
5549
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _MA(unsigned long long int val);
5650

5751

5852

59-
6053
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _kA(long double val);
6154
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _kA(unsigned long long int val);
6255

6356

6457

65-
6658
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _mA(long double val);
6759
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _mA(unsigned long long int val);
6860

6961

7062

71-
7263
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _uA(long double val);
7364
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _uA(unsigned long long int val);
7465

7566

7667

77-
7868
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _nA(long double val);
7969
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _nA(unsigned long long int val);
8070

8171

8272

83-
8473
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _pA(long double val);
8574
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _pA(unsigned long long int val);
8675

8776

8877

89-
9078
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _fA(long double val);
9179
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _fA(unsigned long long int val);
9280

9381

9482

95-
9683
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _aA(long double val);
9784
UNIT_SYSTEM_EXPORT_MACRO electric_current operator "" _aA(unsigned long long int val);
9885

9986

100-
10187
}
10288

10389
}

0 commit comments

Comments
 (0)