diff options
author | Brad King <brad.king@kitware.com> | 2023-10-24 12:31:46 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-10-24 12:31:55 (GMT) |
commit | fd3c95140e8f9ad0a8e11cae19c212525ca8505d (patch) | |
tree | 7a0cd047667cd4e19b16d4874fdadf13bd61283b | |
parent | a27d12c6c0e9e1863e6cc408b4af678a185c31e4 (diff) | |
parent | 6ed999674c9677b67c9584e0b763e2346fda7c90 (diff) | |
download | CMake-fd3c95140e8f9ad0a8e11cae19c212525ca8505d.zip CMake-fd3c95140e8f9ad0a8e11cae19c212525ca8505d.tar.gz CMake-fd3c95140e8f9ad0a8e11cae19c212525ca8505d.tar.bz2 |
Merge topic 'misc-warnings'
6ed999674c Fix clang -Wdeprecated-pragma warnings by removing deprecated ATOMIC_VAR_INIT
162e017b2d Fix clang -Wstrict-prototypes by making main take void instead of nothing
b373a22991 Fix clang -Wreserved-identifier by renaming an enum
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !8905
-rw-r--r-- | Source/CPack/cmCPackLog.h | 2 | ||||
-rw-r--r-- | Source/cmQtAutoMocUic.cxx | 4 | ||||
-rw-r--r-- | Tests/RunCMake/print_stdin.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index 2ab2f8e..347b0f7 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -29,7 +29,7 @@ public: cmCPackLog(const cmCPackLog&) = delete; cmCPackLog& operator=(const cmCPackLog&) = delete; - enum __log_tags + enum cm_log_tags { NOTAG = 0, LOG_OUTPUT = 0x1, diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index ece657d..50110ed 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -190,7 +190,7 @@ public: { public: // -- Parse Cache - std::atomic<bool> ParseCacheChanged = ATOMIC_VAR_INIT(false); + std::atomic<bool> ParseCacheChanged{ false }; cmFileTime ParseCacheTime; ParseCacheT ParseCache; @@ -583,7 +583,7 @@ private: std::string SettingsStringMoc_; std::string SettingsStringUic_; // -- Worker thread pool - std::atomic<bool> JobError_ = ATOMIC_VAR_INIT(false); + std::atomic<bool> JobError_{ false }; cmWorkerPool WorkerPool_; // -- Concurrent processing mutable std::mutex CMakeLibMutex_; diff --git a/Tests/RunCMake/print_stdin.c b/Tests/RunCMake/print_stdin.c index e083e62..76b3a84 100644 --- a/Tests/RunCMake/print_stdin.c +++ b/Tests/RunCMake/print_stdin.c @@ -1,6 +1,6 @@ #include <stdio.h> -int main() +int main(void) { char buf[1024]; size_t nIn = sizeof(buf); |