From 4a220411e1266fea4e0174d30b6f4ad19d546d8a Mon Sep 17 00:00:00 2001 From: Dominik Gleich <dominik.gleich@memgraph.io> Date: Fri, 10 Mar 2017 15:07:42 +0100 Subject: [PATCH] Fix warnings. Reviewers: buda, mferencevic Reviewed By: buda Subscribers: pullbot Differential Revision: https://phabricator.memgraph.io/D110 --- src/utils/hashing/fnv32.hpp | 4 ++-- src/utils/hashing/fnv64.hpp | 4 ++-- tests/concurrent/network_server.cpp | 5 ++++- tests/concurrent/network_session_leak.cpp | 8 ++++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/utils/hashing/fnv32.hpp b/src/utils/hashing/fnv32.hpp index 316f2eb78..675b26605 100644 --- a/src/utils/hashing/fnv32.hpp +++ b/src/utils/hashing/fnv32.hpp @@ -23,7 +23,7 @@ uint32_t fnv32(const T& data) { } template <> -uint32_t fnv32(const std::string& data) { +__attribute__((unused)) uint32_t fnv32(const std::string& data) { return fnv32((const unsigned char*)data.c_str(), data.size()); } @@ -42,7 +42,7 @@ uint32_t fnv1a32(const T& data) { } template <> -uint32_t fnv1a32(const std::string& data) { +__attribute__((unused)) uint32_t fnv1a32(const std::string& data) { return fnv1a32((const unsigned char*)data.c_str(), data.size()); } } diff --git a/src/utils/hashing/fnv64.hpp b/src/utils/hashing/fnv64.hpp index 8004c3ee2..4cbf27b1f 100644 --- a/src/utils/hashing/fnv64.hpp +++ b/src/utils/hashing/fnv64.hpp @@ -23,7 +23,7 @@ uint64_t fnv64(const T& data) { } template <> -uint64_t fnv64(const std::string& data) { +__attribute__((unused)) uint64_t fnv64(const std::string& data) { return fnv64((const unsigned char*)data.c_str(), data.size()); } @@ -42,7 +42,7 @@ uint64_t fnv1a64(const T& data) { } template <> -uint64_t fnv1a64(const std::string& data) { +__attribute__((unused)) uint64_t fnv1a64(const std::string& data) { return fnv1a64((const unsigned char*)data.c_str(), data.size()); } } diff --git a/tests/concurrent/network_server.cpp b/tests/concurrent/network_server.cpp index 2bb1a51f3..5d66f347d 100644 --- a/tests/concurrent/network_server.cpp +++ b/tests/concurrent/network_server.cpp @@ -1,4 +1,6 @@ +#ifndef NDEBUG #define NDEBUG +#endif #include "network_common.hpp" @@ -33,7 +35,8 @@ TEST(Network, Server) { // start clients std::vector<std::thread> clients; for (int i = 0; i < N; ++i) - clients.push_back(std::thread(client_run, i, interface, port, data, 30000, SIZE)); + clients.push_back( + std::thread(client_run, i, interface, port, data, 30000, SIZE)); // cleanup clients for (int i = 0; i < N; ++i) clients[i].join(); diff --git a/tests/concurrent/network_session_leak.cpp b/tests/concurrent/network_session_leak.cpp index 65d2fe3db..d18c6bfa3 100644 --- a/tests/concurrent/network_session_leak.cpp +++ b/tests/concurrent/network_session_leak.cpp @@ -1,4 +1,6 @@ +#ifndef NDEBUG #define NDEBUG +#endif #include <chrono> @@ -39,7 +41,8 @@ TEST(Network, SessionLeak) { int testlen = 3000; for (int i = 0; i < N; ++i) { - clients.push_back(std::thread(client_run, i, interface, port, data, testlen, testlen)); + clients.push_back( + std::thread(client_run, i, interface, port, data, testlen, testlen)); std::this_thread::sleep_for(10ms); } @@ -53,7 +56,8 @@ TEST(Network, SessionLeak) { server_thread.join(); } -// run with "valgrind --leak-check=full ./network_session_leak" to check for memory leaks +// run with "valgrind --leak-check=full ./network_session_leak" to check for +// memory leaks int main(int argc, char **argv) { logging::init_sync(); logging::log->pipe(std::make_unique<Stdout>());