Unordered: Merge from trunk.

Portability fixes, and fix some issues with constructing std::pair.


[SVN r74101]

test/objects/test.hpp

@@ -26,7 +26,7 @@ namespace test
     object generate(object const*);
     implicitly_convertible generate(implicitly_convertible const*);
     
-    class object : globally_counted_object
+    class object : private globally_counted_object
     {
         friend class hash;
         friend class equal_to;
@@ -64,7 +64,7 @@ namespace test
         }
     };
 
-    class implicitly_convertible : globally_counted_object
+    class implicitly_convertible : private globally_counted_object
     {
         int tag1_, tag2_;
     public: