diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75d201ff..623fa242 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Version 126:
 * Tidy up unused variable warnings
 * Don't return end_of_stream on win32 file body writes
 * Fix doc typo
+* Fix shadowing in session_alloc
 
 --------------------------------------------------------------------------------
 
diff --git a/example/common/session_alloc.hpp b/example/common/session_alloc.hpp
index 87b21b97..2250b69d 100644
--- a/example/common/session_alloc.hpp
+++ b/example/common/session_alloc.hpp
@@ -14,6 +14,7 @@
 #include <boost/asio/associated_executor.hpp>
 #include <boost/asio/handler_continuation_hook.hpp>
 #include <boost/assert.hpp>
+#include <boost/core/ignore_unused.hpp>
 #include <boost/intrusive/list.hpp>
 #include <algorithm>
 #include <cstddef>
@@ -233,7 +234,7 @@ class session_alloc
     {
         // Can't friend partial specializations,
         // so we just friend the whole thing.
-        template<class T, class Executor>
+        template<class U, class Executor>
         friend struct boost::asio::associated_executor;
 
         Handler h_;