build: support -Wshadow

Since libev and sha1 do not suite very strict GCC shadowing rules,
the commit does not enable shadowing warning for these third-party
libraries.

Author: drewdzzz

CMakeLists.txt

@@ -11,7 +11,7 @@ FIND_PACKAGE (benchmark QUIET)
 
 SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_C_STANDARD 11)
-ADD_COMPILE_OPTIONS(-Wall -Wextra -Werror)
+ADD_COMPILE_OPTIONS(-Wall -Wextra -Werror -Wshadow)
 
 ADD_LIBRARY(tntcxx INTERFACE)
 ADD_LIBRARY(tntcxx::tntcxx ALIAS tntcxx)

examples/Simple.cpp

@@ -155,8 +155,8 @@ main()
 	uint32_t limit = 1;
 	uint32_t offset = 0;
 	IteratorType iter = IteratorType::EQ;
-	auto i = conn.space[space_id].index[index_id];
-	rid_t select = i.select(std::make_tuple(pk_value), limit, offset, iter);
+	auto index = conn.space[space_id].index[index_id];
+	rid_t select = index.select(std::make_tuple(pk_value), limit, offset, iter);
 	//doclabel09-2
 	/*
 	 * Now let's send our requests to the server. There are two options

examples/Sql.cpp

@@ -226,8 +226,7 @@ main()
 	client.waitAll(conn, prepared_select_futures);
 	for (size_t i = 0; i < prepared_select_futures.size(); ++i) {
 		assert(conn.futureIsReady(prepared_select_futures[i]));
-		Response<Buf_t> response =
-			conn.getResponse(prepared_select_futures[i]);
+		response = conn.getResponse(prepared_select_futures[i]);
 		printResponse<Buf_t>(response);
 	}
 

src/Client/Connection.hpp

@@ -46,8 +46,8 @@ static constexpr ssize_t CONN_READAHEAD = 64 * 1024;
 static constexpr size_t IOVEC_MAX_SIZE = 32;
 
 struct ConnectionError {
-	ConnectionError(const std::string &msg, int errno_ = 0) :
-		msg(msg), saved_errno(errno_)
+	ConnectionError(const std::string &errmsg, int errno_ = 0) :
+		msg(errmsg), saved_errno(errno_)
 	{
 	}
 

src/Client/LibevNetProvider.hpp

@@ -42,7 +42,15 @@
 #include <string_view>
 
 #include "Connection.hpp"
+
+/**
+ * Disable -Wshadow for libev because ev_loop function shadows
+ * declaration of struct ev_loop constructor.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow" 
 #include "ev.h"
+#pragma GCC diagnostic pop
 
 template<class BUFFER, class Stream>
 class Connector;

src/Client/UnixPlainStream.hpp

@@ -72,12 +72,12 @@ class UnixPlainStream : public UnixStream {
 /////////////////////////////////////////////////////////////////////
 
 int
-UnixPlainStream::connect(const ConnectOptions &opts)
+UnixPlainStream::connect(const ConnectOptions &opts_arg)
 {
-	if (opts.transport != STREAM_PLAIN)
+	if (opts_arg.transport != STREAM_PLAIN)
 		US_DIE("Non-plain socket are unsupported in this build."
 		       "Consider enabling it with -DTNTCXX_ENABLE_TLS.");
-	return UnixStream::connect(opts);
+	return UnixStream::connect(opts_arg);
 }
 
 namespace internal {

src/Utils/Sha1.hpp

@@ -33,7 +33,10 @@
 #include <array>
 #include <utility>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
 #include "../third_party/sha1.hpp"
+#pragma GCC diagnostic pop
 
 namespace tnt {
 

src/mpp/Dec.hpp

@@ -547,13 +547,13 @@ struct Jumps {
 	/** Override given tag with special jump. */
 	template <size_t... I>
 	static constexpr data_t
-	build_inject(data_t orig, uint8_t tag, jump_t inject, tnt::iseq<I...>)
+	build_inject(data_t orig, uint8_t tag, jump_t jump, tnt::iseq<I...>)
 	{
-		return {(I != tag ? orig[I] : inject)...};
+		return {(I != tag ? orig[I] : jump)...};
 	}
 
-	constexpr Jumps(Jumps a, uint8_t tag, jump_t inject)
-		: data(build_inject(a.data, tag, inject, is256))
+	constexpr Jumps(Jumps a, uint8_t tag, jump_t jump)
+		: data(build_inject(a.data, tag, jump, is256))
 	{
 	}
 

test/BufferPerfTest.cpp

@@ -56,10 +56,10 @@ struct StaticBuffer {
 
 template <size_t... I, class... T>
 void
-gen_helper(std::index_sequence<I...>, std::tuple<T...>& t)
+gen_helper(std::index_sequence<I...>, std::tuple<T...>& ts)
 {
 	auto set = [](auto& t) { t = rand(); };
-	(set(std::get<I>(t)), ...);
+	(set(std::get<I>(ts)), ...);
 }
 
 template <class... T>

test/BufferUnitTest.cpp

@@ -541,8 +541,8 @@ buffer_release()
 	 * should remain unchanged.
 	 */
 	int i = 0;
-	for (auto tmp = buf.begin(); tmp < mid_itr; ++tmp) {
-		tmp.get(res);
+	for (auto tmp_it = buf.begin(); tmp_it < mid_itr; ++tmp_it) {
+		tmp_it.get(res);
 		fail_unless(res == char_samples[i++ % SAMPLES_CNT]);
 	}
 }