Merge hash and unordered from trunk.

- Replace uses of deprecated C++0x macros
 - Set length of primes inside template on Sun C++. Fixes #3854
 - Missing newline at end of file.



[SVN r59911]

hash/test/container_no_fwd_test.cpp

@@ -11,4 +11,4 @@ int main()
 {
     std::set<int> x;
     std::vector<std::string> y;
-}
+}