diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-07-15 20:41:18 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-07-15 22:28:42 -0500 |
| commit | ec243f43411290bb7f56176e29cb92929dab2953 (patch) | |
| tree | 78d1e3d4b0e86b1246f035ca60f94b29e5254f84 /svl/qa | |
| parent | 578969c51cb7b012fb522d4296c8069a611de29d (diff) | |
Revert "tools: replace boost::ptr_vector with std::unordered_map"
This reverts commit 218be53fe00aebed43df0b041de609b30f99ce95.
MacOSX breaker
Diffstat (limited to 'svl/qa')
| -rw-r--r-- | svl/qa/unit/test_INetContentType.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/svl/qa/unit/test_INetContentType.cxx b/svl/qa/unit/test_INetContentType.cxx index 68badb6745c6..b7aa71cd6e66 100644 --- a/svl/qa/unit/test_INetContentType.cxx +++ b/svl/qa/unit/test_INetContentType.cxx @@ -48,7 +48,8 @@ void Test::testBad() { CPPUNIT_ASSERT(!INetContentTypes::parse(in, t, s, &ps)); CPPUNIT_ASSERT(t.isEmpty()); CPPUNIT_ASSERT(s.isEmpty()); - CPPUNIT_ASSERT(ps.end() == ps.find("foo")); + CPPUNIT_ASSERT_EQUAL( + static_cast<INetContentTypeParameter const *>(0), ps.find("foo")); } void Test::testFull() { @@ -62,9 +63,9 @@ void Test::testFull() { CPPUNIT_ASSERT(INetContentTypes::parse(in, t, s, &ps)); CPPUNIT_ASSERT_EQUAL(OUString("foo"), t); CPPUNIT_ASSERT_EQUAL(OUString("bar"), s); - auto iter = ps.find("baz"); - CPPUNIT_ASSERT(iter != ps.end()); - CPPUNIT_ASSERT_EQUAL(OUString("boz"), iter->second.m_sValue); + INetContentTypeParameter const * p = ps.find("baz"); + CPPUNIT_ASSERT(p != 0); + CPPUNIT_ASSERT_EQUAL(OUString("boz"), p->m_sValue); } void Test::testFollow() { @@ -78,7 +79,8 @@ void Test::testFollow() { CPPUNIT_ASSERT(!INetContentTypes::parse(in, t, s)); CPPUNIT_ASSERT(t.isEmpty()); CPPUNIT_ASSERT(s.isEmpty()); - CPPUNIT_ASSERT(ps.end() == ps.find("baz")); + CPPUNIT_ASSERT_EQUAL( + static_cast<INetContentTypeParameter const *>(0), ps.find("baz")); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); |