Ticket #5275: fusion-std2.patch

File fusion-std2.patch, 9.8 KB (added by Chris Jefferson, 12 years ago)

Updated patch

  • libs/fusion/test/sequence/adapt_tpl_adt.cpp

     
    6565main()
    6666{
    6767    using namespace boost::fusion;
    68     using namespace std;
    6968
    7069    typedef ns::point<int, int> point;
    7170

  • libs/fusion/test/sequence/adapt_struct_named.cpp

     
    5656{
    5757    using namespace boost::fusion;
    5858    using namespace boost;
    59     using namespace std;
    6059
    6160    std::cout << tuple_open('[');
    6261    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/map.cpp

     
    2828{
    2929    using namespace boost::fusion;
    3030    using namespace boost;
    31     using namespace std;
    3231    namespace fusion = boost::fusion;
    3332    using boost::fusion::pair;
    3433    using boost::fusion::make_pair;

  • libs/fusion/test/sequence/adapt_assoc_struct.cpp

     
    6161{
    6262    using namespace boost::fusion;
    6363    using namespace boost;
    64     using namespace std;
    6564
    6665    std::cout << tuple_open('[');
    6766    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp

     
    5757main()
    5858{
    5959    using namespace boost::fusion;
    60     using namespace std;
    6160
    6261    typedef ns::point<int,int> point;
    6362

  • libs/fusion/test/sequence/set.cpp

     
    2828{
    2929    using namespace boost::fusion;
    3030    using namespace boost;
    31     using namespace std;
    3231    namespace fusion = boost::fusion;
    3332    using boost::fusion::pair;
    3433    using boost::fusion::make_pair;

  • libs/fusion/test/sequence/vector_n.cpp

     
    3030{
    3131    using namespace boost::fusion;
    3232    using namespace boost;
    33     using namespace std;
    3433
    3534    {
    3635        vector0<> vec;
    3736        (void) vec;
    38         cout << "(): " << sizeof(vec) << endl;
    39         cout << (boost::is_empty<vector0<> >::value ? "is empty" : "is not empty") << endl;
     37        std::cout << "(): " << sizeof(vec) << std::endl;
     38        std::cout << (boost::is_empty<vector0<> >::value ? "is empty" : "is not empty") << std::endl;
    4039    }
    4140
    4241    {
    … …  
    5655        typedef vector1<int> type;
    5756        type vec(123);
    5857        BOOST_TEST(at_c<0>(vec) == 123);
    59         cout << "(int): " << sizeof(vec) << endl;
     58        std::cout << "(int): " << sizeof(vec) << std::endl;
    6059    }
    6160
    6261    { // testing const vector
    … …  
    9190        type vec(123, 'x');
    9291        BOOST_TEST(at_c<0>(vec) == 123);
    9392        BOOST_TEST(at_c<1>(vec) == 'x');
    94         cout << "(int, char): " << sizeof(vec) << endl;
     93        std::cout << "(int, char): " << sizeof(vec) << std::endl;
    9594    }
    9695
    9796    {
    … …  
    120119        BOOST_TEST(at_c<0>(vec) == 123);
    121120        BOOST_TEST(at_c<1>(vec) == 'x');
    122121        BOOST_TEST(at_c<2>(vec) >= 123.455 && at_c<2>(vec) <= 123.457);
    123         cout << "(int, char, double): " << sizeof(vec) << endl;
     122        std::cout << "(int, char, double): " << sizeof(vec) << std::endl;
    124123    }
    125124
    126125    {
    127126        typedef vector4<int, char, double, bool> type;
    128127        type vec(123, 'x', 123.456, true);
    129         cout << "(int, char, double, bool): " << sizeof(vec) << endl;
     128        std::cout << "(int, char, double, bool): " << sizeof(vec) << std::endl;
    130129    }
    131130
    132131    {
    133132        typedef vector4<int, char, bool, double> type;
    134133        type vec(123, 'x', true, 123.456);
    135         cout << "(int, char, bool, double): " << sizeof(vec) << endl;
     134        std::cout << "(int, char, bool, double): " << sizeof(vec) << std::endl;
    136135    }
    137136
    138137    {
    … …  
    154153        BOOST_STATIC_ASSERT((boost::is_same<long, result_of::value_at_c<type, 4>::type>::value));
    155154        BOOST_STATIC_ASSERT((boost::is_same<float, result_of::value_at_c<type, 5>::type>::value));
    156155        BOOST_STATIC_ASSERT((boost::is_same<double, result_of::value_at_c<type, 6>::type>::value));
    157         cout << "(bool, char, short, int, long, float, double): " << sizeof(vec) << endl;
     156        std::cout << "(bool, char, short, int, long, float, double): " << sizeof(vec) << std::endl;
    158157    }
    159158
    160159    {
    161160        typedef vector10<int, int, int, int, int, int, int, int, int, int> type;
    162161        type vec; // compile check only
    163         cout << "vector10 of int: " << sizeof(vec) << endl;
     162        std::cout << "vector10 of int: " << sizeof(vec) << std::endl;
    164163    }
    165164
    166165    {
    … …  
    169168          , int, int, int, int, int, int, int, int, int, int> type;
    170169
    171170        type vec; // compile check only
    172         cout << "vector20 of int: " << sizeof(vec) << endl;
     171        std::cout << "vector20 of int: " << sizeof(vec) << std::endl;
    173172    }
    174173
    175174    {
    … …  
    179178          , int, int, int, int, int, int, int, int, int, int> type;
    180179
    181180        type vec; // compile check only
    182         cout << "vector30 of int: " << sizeof(vec) << endl;
     181        std::cout << "vector30 of int: " << sizeof(vec) << std::endl;
    183182    }
    184183
    185184    {
    … …  
    190189          , int, int, int, int, int, int, int, int, int, int> type;
    191190
    192191        type vec; // compile check only
    193         cout << "vector40 of int: " << sizeof(vec) << endl;
     192        std::cout << "vector40 of int: " << sizeof(vec) << std::endl;
    194193    }
    195194
    196195    {
    … …  
    202201          , int, int, int, int, int, int, int, int, int, int> type;
    203202
    204203        type vec; // compile check only
    205         cout << "vector50 of int: " << sizeof(vec) << endl;
     204        std::cout << "vector50 of int: " << sizeof(vec) << std::endl;
    206205    }
    207206   
    208207    {

  • libs/fusion/test/sequence/adapt_adt.cpp

     
    9292{
    9393    using namespace boost::fusion;
    9494    using namespace boost;
    95     using namespace std;
    9695
    9796    std::cout << tuple_open('[');
    9897    std::cout << tuple_close(']');
    … …  
    111110        at_c<1>(p) = 9;
    112111        BOOST_TEST(p == make_vector(6, 9));
    113112
    114         BOOST_STATIC_ASSERT(result_of::size<ns::point>::value == 2);
    115         BOOST_STATIC_ASSERT(!result_of::empty<ns::point>::value);
     113        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
     114        BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);
    116115
    117116        BOOST_TEST(front(p) == 6);
    118117        BOOST_TEST(back(p) == 9);

  • libs/fusion/test/sequence/adapt_adt_named.cpp

     
    6464{
    6565    using namespace boost::fusion;
    6666    using namespace boost;
    67     using namespace std;
    6867
    6968    std::cout << tuple_open('[');
    7069    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/std_pair.cpp

     
    3636{
    3737    using namespace boost::fusion;
    3838    using namespace boost;
    39     using namespace std;
    4039
    4140    std::cout << tuple_open('[');
    4241    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/adapt_assoc_adt.cpp

     
    5555main()
    5656{
    5757    using namespace boost::fusion;
    58     using namespace std;
    5958
    6059    std::cout << tuple_open('[');
    6160    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/adapt_assoc_adt_named.cpp

     
    5656main()
    5757{
    5858    using namespace boost::fusion;
    59     using namespace std;
    6059
    6160    std::cout << tuple_open('[');
    6261    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/boost_tuple.cpp

     
    3737{
    3838    using namespace boost::fusion;
    3939    using namespace boost;
    40     using namespace std;
    4140
    4241    std::cout << tuple_open('[');
    4342    std::cout << tuple_close(']');

  • libs/fusion/test/sequence/adapt_struct.cpp

     
    7878{
    7979    using namespace boost::fusion;
    8080    using namespace boost;
    81     using namespace std;
    8281
    8382    std::cout << tuple_open('[');
    8483    std::cout << tuple_close(']');