Skip to content

Commit b0c2861

Browse files
committed
fixed lit
1 parent afb03d6 commit b0c2861

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

sycl/unittests/helpers/MockDeviceImage.hpp

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,19 @@ class MockDeviceImage {
251251
MockDeviceImage(uint16_t Version, uint8_t Kind, uint8_t Format,
252252
const std::string &DeviceTargetSpec,
253253
const std::string &CompileOptions,
254-
const std::string &LinkOptions, std::vector<char> &&Manifest,
254+
const std::string &LinkOptions,
255+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
256+
std::vector<char> &&Manifest,
257+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
255258
std::vector<unsigned char> &&Binary,
256259
internal::LifetimeExtender<MockOffloadEntry> OffloadEntries,
257260
MockPropertySet PropertySet)
258261
: MVersion(Version), MKind(Kind), MFormat(Format),
259262
MDeviceTargetSpec(DeviceTargetSpec), MCompileOptions(CompileOptions),
260-
MLinkOptions(LinkOptions), MManifest(std::move(Manifest)),
263+
MLinkOptions(LinkOptions),
264+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
265+
MManifest(std::move(Manifest)),
266+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
261267
MBinary(std::move(Binary)), MOffloadEntries(std::move(OffloadEntries)),
262268
MPropertySet(std::move(PropertySet)) {
263269
MNativeHandle = {
@@ -267,8 +273,10 @@ class MockDeviceImage {
267273
MDeviceTargetSpec.c_str(),
268274
MCompileOptions.c_str(),
269275
MLinkOptions.c_str(),
276+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
270277
MManifest.empty() ? nullptr : &*MManifest.cbegin(),
271278
MManifest.empty() ? nullptr : &*MManifest.crbegin() + 1,
279+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
272280
&*MBinary.begin(),
273281
(&*MBinary.begin()) + MBinary.size(),
274282
MOffloadEntries.begin(),
@@ -283,12 +291,19 @@ class MockDeviceImage {
283291
MockDeviceImage(uint16_t Version, uint8_t Kind, uint8_t Format,
284292
const std::string &DeviceTargetSpec,
285293
const std::string &CompileOptions,
286-
const std::string &LinkOptions, std::vector<char> &&Manifest,
294+
const std::string &LinkOptions,
295+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
296+
std::vector<char> &&Manifest,
297+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
287298
std::vector<unsigned char> &&Binary,
288299
std::vector<MockOffloadEntry> &&OffloadEntries,
289300
MockPropertySet PropertySet)
290301
: MockDeviceImage(Version, Kind, Format, DeviceTargetSpec, CompileOptions,
291-
LinkOptions, std::move(Manifest), std::move(Binary),
302+
LinkOptions,
303+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
304+
std::move(Manifest),
305+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
306+
std::move(Binary),
292307
internal::LifetimeExtender(std::move(OffloadEntries)),
293308
std::move(PropertySet)) {}
294309

@@ -300,7 +315,10 @@ class MockDeviceImage {
300315
MockPropertySet PropertySet)
301316
: MockDeviceImage(SYCL_DEVICE_BINARY_VERSION,
302317
SYCL_DEVICE_BINARY_OFFLOAD_KIND_SYCL, Format,
303-
DeviceTargetSpec, CompileOptions, LinkOptions, {},
318+
DeviceTargetSpec, CompileOptions, LinkOptions,
319+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
320+
{},
321+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
304322
std::move(Binary),
305323
internal::LifetimeExtender(std::move(OffloadEntries)),
306324
std::move(PropertySet)) {}
@@ -315,7 +333,11 @@ class MockDeviceImage {
315333
: MockDeviceImage(
316334
SYCL_DEVICE_BINARY_VERSION, SYCL_DEVICE_BINARY_OFFLOAD_KIND_SYCL,
317335
SYCL_DEVICE_BINARY_TYPE_SPIRV, __SYCL_DEVICE_BINARY_TARGET_SPIRV64,
318-
"", "", {}, std::vector<unsigned char>{1, 2, 3, 4, 5},
336+
"", "",
337+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
338+
{},
339+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
340+
std::vector<unsigned char>{1, 2, 3, 4, 5},
319341
internal::LifetimeExtender(std::move(OffloadEntries)),
320342
std::move(PropertySet)) {}
321343

@@ -338,7 +360,9 @@ class MockDeviceImage {
338360
std::string MDeviceTargetSpec;
339361
std::string MCompileOptions;
340362
std::string MLinkOptions;
363+
#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
341364
std::vector<char> MManifest;
365+
#endif // __INTEL_PREVIEW_BREAKING_CHANGES
342366
std::vector<unsigned char> MBinary;
343367
internal::LifetimeExtender<MockOffloadEntry> MOffloadEntries;
344368
MockPropertySet MPropertySet;

0 commit comments

Comments
 (0)