Skip to content

Commit 25af48a

Browse files
committed
Switch to using shared_ptr to avoid unique symbols
Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent 2233385 commit 25af48a

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

source/layers/validation/ze_validation_layer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace validation_layer
3434
// init thread, before zeDdiTable.exchange() makes the validation layer
3535
// reachable from other threads. The non-atomic shared_ptr assignment is
3636
// therefore safe in practice; no mutex is needed here.
37-
logger = std::make_shared<loader::ZeLogger>(); // no-op sentinel: no sink, no mutex, no syscalls
37+
logger = std::shared_ptr<loader::ZeLogger>(new loader::ZeLogger()); // no-op sentinel: no sink, no mutex, no syscalls
3838
}
3939

4040
///////////////////////////////////////////////////////////////////////////////

source/utils/ze_logger.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -526,15 +526,15 @@ std::shared_ptr<ZeLogger> createLogger(const std::string &caller) {
526526
// logging_enabled=1, log_console=1 → console (stderr), configured level
527527
if (!logging_enabled && !log_console) {
528528
// Pure no-op: no sink, no mutex, no isatty() syscall, no pattern string.
529-
return std::make_shared<ZeLogger>();
529+
return std::shared_ptr<ZeLogger>(new ZeLogger());
530530
}
531531

532532
LogLevel level = logLevelFromString(log_level);
533533

534534
std::shared_ptr<ZeLogger> logger;
535535
std::string output_dest;
536536
if (log_console) {
537-
logger = std::make_shared<ZeLogger>(/*use_stderr=*/true, level, log_pattern);
537+
logger = std::shared_ptr<ZeLogger>(new ZeLogger(/*use_stderr=*/true, level, log_pattern));
538538
output_dest = "stderr (console)";
539539
} else {
540540
// Create the full directory path (equivalent to mkdir -p).
@@ -550,12 +550,12 @@ std::shared_ptr<ZeLogger> createLogger(const std::string &caller) {
550550
if (_mkdir(partial.c_str()) != 0 && errno != EEXIST) {
551551
std::cerr << "ze_logger: Failed to create log directory '"
552552
<< partial << "': " << errnoToString(errno) << "\n";
553-
return std::make_shared<ZeLogger>();
553+
return std::shared_ptr<ZeLogger>(new ZeLogger());
554554
}
555555
} else if (!(attrs & FILE_ATTRIBUTE_DIRECTORY)) {
556556
std::cerr << "ze_logger: Log directory path component '"
557557
<< partial << "' exists but is not a directory\n";
558-
return std::make_shared<ZeLogger>();
558+
return std::shared_ptr<ZeLogger>(new ZeLogger());
559559
}
560560
}
561561
}
@@ -570,17 +570,17 @@ std::shared_ptr<ZeLogger> createLogger(const std::string &caller) {
570570
if (mkdir(partial.c_str(), 0755) != 0 && errno != EEXIST) {
571571
std::cerr << "ze_logger: Failed to create log directory '"
572572
<< partial << "': " << errnoToString(errno) << "\n";
573-
return std::make_shared<ZeLogger>();
573+
return std::shared_ptr<ZeLogger>(new ZeLogger());
574574
}
575575
} else if (!S_ISDIR(st.st_mode)) {
576576
std::cerr << "ze_logger: Log directory path component '"
577577
<< partial << "' exists but is not a directory\n";
578-
return std::make_shared<ZeLogger>();
578+
return std::shared_ptr<ZeLogger>(new ZeLogger());
579579
}
580580
}
581581
}
582582
#endif
583-
logger = std::make_shared<ZeLogger>(full_log_file_path, level, log_pattern);
583+
logger = std::shared_ptr<ZeLogger>(new ZeLogger(full_log_file_path, level, log_pattern));
584584
output_dest = full_log_file_path;
585585
}
586586

0 commit comments

Comments
 (0)