merged fusion from the trunk

[SVN r63560]

test/sequence/adapt_tpl_class.cpp

@@ -40,7 +40,7 @@ namespace ns
     public:
     
         point() : x(0), y(0) {}
-        point(X x, Y y) : x(x), y(y) {}
+        point(X x_, Y y_) : x(x_), y(y_) {}
             
         X get_x() const { return x; }
         Y get_y() const { return y; }
@@ -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;
     }