diff --git a/doc/container.qbk b/doc/container.qbk
index a535fc4..be6ea1f 100644
--- a/doc/container.qbk
+++ b/doc/container.qbk
@@ -1217,6 +1217,7 @@ use [*Boost.Container]? There are several reasons for that:
 
 * Fixed bugs:
    * [@https://svn.boost.org/trac/boost/ticket/11170 Trac #11170: ['"Doc slip for index_of"]].
+   * [@https://svn.boost.org/trac/boost/ticket/12177 Trac #12177: ['"vector::priv_merge uses unqualified uintptr_t"]].
 
 [endsect]
 
diff --git a/include/boost/container/vector.hpp b/include/boost/container/vector.hpp
index 40a4f88..8e5a481 100644
--- a/include/boost/container/vector.hpp
+++ b/include/boost/container/vector.hpp
@@ -2246,7 +2246,7 @@ class vector
             size_type *indexes = 0;
             while(remaining){
                //Query for room to store indexes in the remaining buffer
-               uintptr_t const szt_align_mask = container_detail::alignment_of<size_type>::value - 1;
+               boost::uintptr_t const szt_align_mask = container_detail::alignment_of<size_type>::value - 1;
                boost::uintptr_t const addr = boost::uintptr_t(this->priv_raw_begin() + s + n);
                boost::uintptr_t const capaddr = boost::uintptr_t(this->priv_raw_begin() + c);
                boost::uintptr_t const aligned_addr = (addr + szt_align_mask) & ~szt_align_mask;