Clean up MSVC build. Fixes #1619. Fixes #3074.

[SVN r62854]

test/sequence/define_assoc_tpl_struct.cpp

@@ -79,14 +79,14 @@ main()
     {
         // conversion from point to vector
         point p(5, 3);
-        vector<int, short> v(p);
+        vector<int, long> v(p);
         v = p;
     }
 
     {
         // conversion from point to list
         point p(5, 3);
-        list<int, short> l(p);
+        list<int, long> l(p);
         l = p;
     }