mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 23:39:01 +08:00
8ad33ead90
* Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * WIP: update to tensorflow 2.6 * update patch * update more patches * fix patch again * fix new Windows compile/linkage errors * fix patch * fix patch again * temporarily revert Windows build option fix to test whether upstream fix doesn't work * check if constexpr is sufficient (is_same_v requires C++17) * try patch for build parameters * remove fastbuild patch and improve constexpr patch (no C++17 requirement) (fastbuild patch didn't work because bazel overrides it with /DEBUG:FULL) * x-add-version * add C++17 preprocessor switch for "if constexpr" * x-add-version * remove pre-processor switch (doesn't work without) * x-add-version * work-around toolchain issues on macOS * x-add-version * fix Windows build options (must be string, not list) * x-add-version * temporarily add code to debug CI * temporarily add more debug output as build doesn't even start on macOS CI * remove debug code, add switch for linker parameters on macOS and re-introduce old behaviour (some platforms still use old behaviour) * x-add-version * fix broken string termination * x-add-version * fix function name * x-add-version Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
22 lines
1002 B
Diff
22 lines
1002 B
Diff
diff --git a/tensorflow/core/platform/default/logging.h b/tensorflow/core/platform/default/logging.h
|
|
--- a/tensorflow/core/platform/default/logging.h
|
|
+++ b/tensorflow/core/platform/default/logging.h
|
|
@@ -104,13 +104,13 @@ class LogMessageFatal : public LogMessage {
|
|
};
|
|
|
|
#define _TF_LOG_INFO \
|
|
- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::INFO)
|
|
+ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::INFO)
|
|
#define _TF_LOG_WARNING \
|
|
- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::WARNING)
|
|
+ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::WARNING)
|
|
#define _TF_LOG_ERROR \
|
|
- ::tensorflow::internal::LogMessage(__FILE__, __LINE__, ::tensorflow::ERROR)
|
|
+ tensorflow::internal::LogMessage(__FILE__, __LINE__, tensorflow::ERROR)
|
|
#define _TF_LOG_FATAL \
|
|
- ::tensorflow::internal::LogMessageFatal(__FILE__, __LINE__)
|
|
+ tensorflow::internal::LogMessageFatal(__FILE__, __LINE__)
|
|
|
|
#define _TF_LOG_QFATAL _TF_LOG_FATAL
|
|
|