← Back to branch summary

~ps-jenkins/compiz/latestsnapshot-10.9.9daily13.06.1913.04-0ubuntu1

« back to all changes in this revision

Viewing changes to src/string/tests/printf/src/test-string-printf.cpp

  • Committer: Tarmac
  • Author(s): Daniel van Vugt
  • Date: 2013-04-02 19:24:11 UTC
  • mfrom: (3643.1.3 back-to-raring)
  • Revision ID: tarmac-20130402192411-8jqkwbion75aazvt
Make lp:compiz/0.9.9 identical to lp:compiz/raring, so we can use it for 
raring maintenance and eliminate lp:compiz/raring.

The changes that this proposal "undoes" have not been lost. They have just
moved to the new development series: lp:compiz/0.9.10 (lp:compiz now points
to this).

Approved by PS Jenkins bot, Sam Spilsbury.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/string/tests/printf/src/test-string-printf.cpp
94
94
{
95
95
    if (fmt == "%i" || fmt == "%d")
96
96
        return compPrintf(fmt.c_str(),
97
 
                (boost::static_pointer_cast<TValue<int> >(v))->value());
 
97
                (boost::shared_static_cast<TValue<int> >(v))->value());
98
98
    if (fmt == "%f")
99
99
        return compPrintf(fmt.c_str(),
100
 
                (boost::static_pointer_cast<TValue<float> >(v))->value());
 
100
                (boost::shared_static_cast<TValue<float> >(v))->value());
101
101
    if (fmt == "%s")
102
102
        return compPrintf(
103
103
                fmt.c_str(),
104
 
                (boost::static_pointer_cast<TValue<std::string> >(v))->value().c_str());
 
104
                (boost::shared_static_cast<TValue<std::string> >(v))->value().c_str());
105
105
    if (fmt == "%x")
106
106
        return compPrintf(fmt.c_str(),
107
 
                (boost::static_pointer_cast<TValue<int> >(v))->value());
 
107
                (boost::shared_static_cast<TValue<int> >(v))->value());
108
108
 
109
109
    return "not_reached";
110
110
}
142
142
 
143
143
    ASSERT_EQ(s1, s2);
144
144
 
145
 
    formatValues["%i"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (6));
 
145
    formatValues["%i"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (6)));
146
146
    formatStrings["%i"] = CompString ("6");
147
 
    formatValues["%f"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<float> (6.532));
 
147
    formatValues["%f"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<float> (6.532)));
148
148
    formatStrings["%f"] = CompString ("6.532000");
149
 
    formatValues["%x"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (0x34fe5aa));
 
149
    formatValues["%x"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (0x34fe5aa)));
150
150
    formatStrings["%x"] = CompString ("34fe5aa");
151
 
    formatValues["%d"] = compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (2));
 
151
    formatValues["%d"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (2)));
152
152
    formatStrings["%d"] = CompString ("2");
153
153
 
154
154
    for (std::map <CompString, CompString>::iterator it = formatStrings.begin ();