From f07732a9ca1d5720a47f7dd6c4f4e8ffefaf3c89 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 1 Aug 2013 18:49:57 -0700 Subject: [PATCH] Fix clang warnings --- modules/beast_basics/threads/beast_InterruptibleThread.h | 1 - modules/beast_basics/threads/beast_Listeners.cpp | 4 +--- modules/beast_basics/threads/beast_ParallelFor.h | 1 - modules/beast_core/containers/beast_HashMap.h | 2 ++ modules/beast_core/diagnostic/beast_UnitTest.cpp | 1 - modules/beast_core/diagnostic/beast_UnitTest.h | 1 - 6 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/beast_basics/threads/beast_InterruptibleThread.h b/modules/beast_basics/threads/beast_InterruptibleThread.h index f81dfc213..f464fc751 100644 --- a/modules/beast_basics/threads/beast_InterruptibleThread.h +++ b/modules/beast_basics/threads/beast_InterruptibleThread.h @@ -152,7 +152,6 @@ private: ThreadHelper m_thread; EntryPoint* m_entryPoint; - Function m_function; WaitableEvent m_runEvent; id m_threadId; diff --git a/modules/beast_basics/threads/beast_Listeners.cpp b/modules/beast_basics/threads/beast_Listeners.cpp index e2f60bcf2..fcf6607d2 100644 --- a/modules/beast_basics/threads/beast_Listeners.cpp +++ b/modules/beast_basics/threads/beast_Listeners.cpp @@ -355,8 +355,7 @@ public: inline Work (Proxy* proxy, Entry* const entry, const timestamp_t timestamp) - : m_proxy (proxy) - , m_entry (entry) + : m_entry (entry) , m_timestamp (timestamp) { } @@ -374,7 +373,6 @@ public: } private: - Proxy* const m_proxy; Entry::Ptr m_entry; const timestamp_t m_timestamp; }; diff --git a/modules/beast_basics/threads/beast_ParallelFor.h b/modules/beast_basics/threads/beast_ParallelFor.h index 3903ce445..77f19df07 100644 --- a/modules/beast_basics/threads/beast_ParallelFor.h +++ b/modules/beast_basics/threads/beast_ParallelFor.h @@ -246,7 +246,6 @@ private: WaitableEvent m_finishedEvent; Atomic m_currentIndex; Atomic m_numberOfInstances; - int m_numberOfIterations; }; #endif diff --git a/modules/beast_core/containers/beast_HashMap.h b/modules/beast_core/containers/beast_HashMap.h index ce467371d..981a00425 100644 --- a/modules/beast_core/containers/beast_HashMap.h +++ b/modules/beast_core/containers/beast_HashMap.h @@ -48,6 +48,7 @@ public: int generateHash (const var& key, const int upperLimit) const noexcept { return generateHash (key.toString(), upperLimit); } }; +#if 0 /** Hardened hash functions for use with HashMap. The seed is used to make the hash unpredictable. This prevents @@ -74,6 +75,7 @@ public: private: int m_seed; }; +#endif //============================================================================== /** diff --git a/modules/beast_core/diagnostic/beast_UnitTest.cpp b/modules/beast_core/diagnostic/beast_UnitTest.cpp index 285d4e019..96db55222 100644 --- a/modules/beast_core/diagnostic/beast_UnitTest.cpp +++ b/modules/beast_core/diagnostic/beast_UnitTest.cpp @@ -207,7 +207,6 @@ void UnitTest::finishCase () UnitTests::UnitTests() : m_assertOnFailure (false) - , m_currentTest (nullptr) { } diff --git a/modules/beast_core/diagnostic/beast_UnitTest.h b/modules/beast_core/diagnostic/beast_UnitTest.h index 25bce4aa9..abf654c3e 100644 --- a/modules/beast_core/diagnostic/beast_UnitTest.h +++ b/modules/beast_core/diagnostic/beast_UnitTest.h @@ -413,7 +413,6 @@ private: private: bool m_assertOnFailure; ScopedPointer m_results; - UnitTest* m_currentTest; }; #endif