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

[SVN r62854]

test/sequence/adapt_tpl_class.cpp

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