Merge pull request #2970 from bluca/format

Problem: CI check for format fails

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,14 @@ Problem: X is broken
 Solution: do Y and Z to fix X
 ```
 
+Please try to have the code changes conform to our coding style. For your
+convenience, you can install clang-format (at least version 5.0) and then
+run ```make clang-format-check```. Don't fix existing issues, if any - just
+make sure your changes are compliant. ```make clang-format-diff``` will
+automatically apply the required changes.
+To set a specific clang-format binary with autotools, you can for example
+run: ```./configure CLANG_FORMAT=clang-format-5.0```
+
 Please avoid sending a pull request with recursive merge nodes, as they
 are impossible to fix once merged. Please rebase your branch on
 zeromq/libzmq master instead of merging it.

src/generic_mtrie_impl.hpp

@@ -167,7 +167,7 @@ void zmq::generic_mtrie_t<T>::rm (value_t *pipe_,
 
 template <typename T>
 template <typename Arg>
-void zmq::generic_mtrie_t<T>::rm_helper(value_t *pipe_,
+void zmq::generic_mtrie_t<T>::rm_helper (value_t *pipe_,
                                          unsigned char **buff_,
                                          size_t buffsize_,
                                          size_t maxbuffsize_,

src/zmq.cpp

@@ -682,7 +682,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
     }
 }
 
-// Polling.
+    // Polling.
 
 #if defined ZMQ_HAVE_POLLER
 inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)