Skip to content

Commit eca7e4d

Browse files
committed
Fix some warnings.
1 parent 702926a commit eca7e4d

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

src/sw/driver/suffix.h

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,134 +41,134 @@ _s?, _sf? - source file
4141

4242
// api definition
4343
// _api
44-
inline ApiNameType operator "" _api(const char *s, size_t)
44+
inline ApiNameType operator ""_api(const char *s, size_t)
4545
{
4646
return ApiNameType(String(s));
4747
}
4848

4949
// definition
5050
// _d or _def
51-
inline Definition operator "" _d(const char *s, size_t)
51+
inline Definition operator ""_d(const char *s, size_t)
5252
{
5353
return Definition(String(s));
5454
}
55-
inline Definition operator "" _def(const char *s, size_t)
55+
inline Definition operator ""_def(const char *s, size_t)
5656
{
5757
return Definition(String(s));
5858
}
5959

6060
// dependency
6161
// _dep
62-
inline DependencyPtr operator "" _dep(const char *s, size_t)
62+
inline DependencyPtr operator ""_dep(const char *s, size_t)
6363
{
6464
return std::make_shared<Dependency>(extractFromString(s));
6565
}
6666

6767
// _fi - force include file
68-
inline ForceIncludeFile operator "" _fi(const char *s, size_t)
68+
inline ForceIncludeFile operator ""_fi(const char *s, size_t)
6969
{
7070
return ForceIncludeFile{std::string{s}};
7171
}
7272

7373
// framework (macos)
7474
// _framework (_fr? fw?)
75-
inline Framework operator "" _framework(const char *s, size_t)
75+
inline Framework operator ""_framework(const char *s, size_t)
7676
{
7777
return Framework(String(s));
7878
}
7979

8080
// include directory
8181
// _id or _idir
82-
inline IncludeDirectory operator "" _id(const char *s, size_t)
82+
inline IncludeDirectory operator ""_id(const char *s, size_t)
8383
{
8484
return IncludeDirectory(String(s));
8585
}
86-
inline IncludeDirectory operator "" _idir(const char *s, size_t)
86+
inline IncludeDirectory operator ""_idir(const char *s, size_t)
8787
{
8888
return IncludeDirectory(String(s));
8989
}
9090

9191
// link directory
9292
// _ld or _ldir
93-
inline LinkDirectory operator "" _ld(const char *s, size_t)
93+
inline LinkDirectory operator ""_ld(const char *s, size_t)
9494
{
9595
return LinkDirectory(String(s));
9696
}
97-
inline LinkDirectory operator "" _ldir(const char *s, size_t)
97+
inline LinkDirectory operator ""_ldir(const char *s, size_t)
9898
{
9999
return LinkDirectory(String(s));
100100
}
101101

102102
// link library
103103
// _l or _lib
104-
/*inline LinkLibrary operator "" _l(const char *s, size_t)
104+
/*inline LinkLibrary operator ""_l(const char *s, size_t)
105105
{
106106
return LinkLibrary(String(s));
107107
}*/
108-
inline LinkLibrary operator "" _lib(const char *s, size_t)
108+
inline LinkLibrary operator ""_lib(const char *s, size_t)
109109
{
110110
return LinkLibrary(String(s));
111111
}
112112

113113
// precompiled header
114114
// _pch
115-
inline PrecompiledHeader operator "" _pch(const char *s, size_t)
115+
inline PrecompiledHeader operator ""_pch(const char *s, size_t)
116116
{
117117
return PrecompiledHeader(String(s));
118118
}
119119

120120
// regex
121-
inline FileRegex operator "" _r(const char *s, size_t)
121+
inline FileRegex operator ""_r(const char *s, size_t)
122122
{
123123
return FileRegex(s, false);
124124
}
125125

126126
// recursive regex
127-
inline FileRegex operator "" _rr(const char *s, size_t)
127+
inline FileRegex operator ""_rr(const char *s, size_t)
128128
{
129129
return FileRegex(s, true);
130130
}
131131

132132
// system link library
133133
// _slib
134-
inline SystemLinkLibrary operator "" _slib(const char *s, size_t)
134+
inline SystemLinkLibrary operator ""_slib(const char *s, size_t)
135135
{
136136
return SystemLinkLibrary(String(s));
137137
}
138138

139139
// variable
140140
// _v or _var
141-
inline Variable operator "" _v(const char *s, size_t)
141+
inline Variable operator ""_v(const char *s, size_t)
142142
{
143143
return Variable{ s };
144144
}
145-
inline Variable operator "" _var(const char *s, size_t)
145+
inline Variable operator ""_var(const char *s, size_t)
146146
{
147147
return Variable{ s };
148148
}
149149

150150
// sources
151151

152-
inline Git operator "" _git(const char *s, size_t)
152+
inline Git operator ""_git(const char *s, size_t)
153153
{
154154
return Git(s);
155155
}
156-
inline Git operator "" _git_v(const char *s, size_t)
156+
inline Git operator ""_git_v(const char *s, size_t)
157157
{
158158
return Git(s, "v{v}");
159159
}
160160

161-
inline RemoteFile operator "" _remote(const char *s, size_t)
161+
inline RemoteFile operator ""_remote(const char *s, size_t)
162162
{
163163
return RemoteFile(s);
164164
}
165165

166166
// modules
167-
inline HeaderUnit operator "" _qhu(const char *s, size_t)
167+
inline HeaderUnit operator ""_qhu(const char *s, size_t)
168168
{
169169
return HeaderUnit{s, false};
170170
}
171-
inline HeaderUnit operator "" _ahu(const char *s, size_t)
171+
inline HeaderUnit operator ""_ahu(const char *s, size_t)
172172
{
173173
return HeaderUnit{s, true};
174174
}

src/sw/driver/tools/self_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ String write_build_script(SwCoreContext &swctx,
225225
bool has_checks = f.find("Checker") != f.npos; // more presize than setChecks
226226

227227
build.beginBlock();
228-
build.addLine("auto i = std::make_unique<BuiltinInput>(swctx, d, " + std::to_string(s.getHash(idb)) + ");");
228+
build.addLine("auto i = std::make_unique<BuiltinInput>(swctx, d, " + std::to_string(s.getHash(idb)) + "ULL);");
229229
build.addLine("auto ep = std::make_unique<sw::NativeBuiltinTargetEntryPoint>(build_" + r.getVariableName() + ");");
230230
if (has_checks)
231231
build.addLine("ep->cf = check_" + r.getVariableName() + ";");

0 commit comments

Comments
 (0)