gcc4 fix.

This commit is contained in:
Adrien Destugues 2014-10-22 18:58:37 +02:00
parent 377c5aecf0
commit 5dbd0f48cc

View File

@ -30,41 +30,41 @@ FormatDescriptionsTest::TestCompare()
a.u.avi.codec = 'DIVX'; a.u.avi.codec = 'DIVX';
media_format_description b; media_format_description b;
CPPUNIT_ASSERT(a != b); CPPUNIT_ASSERT(!(a == b));
b.family = a.family; b.family = a.family;
CPPUNIT_ASSERT(a != b); CPPUNIT_ASSERT(!(a == b));
a.family = B_QUICKTIME_FORMAT_FAMILY; a.family = B_QUICKTIME_FORMAT_FAMILY;
a.u.quicktime.vendor = 5; a.u.quicktime.vendor = 5;
a.u.quicktime.codec = 5; a.u.quicktime.codec = 5;
b.family = B_QUICKTIME_FORMAT_FAMILY; b.family = B_QUICKTIME_FORMAT_FAMILY;
b.u.quicktime.vendor = 6; b.u.quicktime.vendor = 6;
b.u.quicktime.codec = 5; b.u.quicktime.codec = 5;
CPPUNIT_ASSERT(a < b); CPPUNIT_ASSERT(a < b);
b.u.quicktime.vendor = 4; b.u.quicktime.vendor = 4;
CPPUNIT_ASSERT(a > b); CPPUNIT_ASSERT(b < a);
b.u.quicktime.vendor = 5; b.u.quicktime.vendor = 5;
b.u.quicktime.codec = 6; b.u.quicktime.codec = 6;
CPPUNIT_ASSERT(a < b); CPPUNIT_ASSERT(a < b);
b.u.quicktime.codec = 4; b.u.quicktime.codec = 4;
CPPUNIT_ASSERT(a > b); CPPUNIT_ASSERT(b < a);
a.family = B_MISC_FORMAT_FAMILY; a.family = B_MISC_FORMAT_FAMILY;
a.u.misc.file_format = 5; a.u.misc.file_format = 5;
a.u.misc.codec = 5; a.u.misc.codec = 5;
b.family = B_MISC_FORMAT_FAMILY; b.family = B_MISC_FORMAT_FAMILY;
b.u.misc.file_format = 6; b.u.misc.file_format = 6;
b.u.misc.codec = 5; b.u.misc.codec = 5;
CPPUNIT_ASSERT(a < b); CPPUNIT_ASSERT(a < b);
b.u.misc.file_format = 4; b.u.misc.file_format = 4;
CPPUNIT_ASSERT(a > b); CPPUNIT_ASSERT(b < a);
b.u.misc.file_format = 5; b.u.misc.file_format = 5;
@ -72,7 +72,7 @@ FormatDescriptionsTest::TestCompare()
CPPUNIT_ASSERT(a < b); CPPUNIT_ASSERT(a < b);
b.u.misc.codec = 4; b.u.misc.codec = 4;
CPPUNIT_ASSERT(a > b); CPPUNIT_ASSERT(b < a);
} }