diff options
| author | randomdan <randomdan@localhost> | 2014-09-27 12:42:04 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2014-09-27 12:42:04 +0000 |
| commit | 90e8a2a45041cb2099b9ba1113404fda5338462c (patch) | |
| tree | 2822ab0feaf6a1623a90986a46ae52922b55cdc5 /libtmdb | |
| parent | First bash at a slicer ice proxy for TMDb and an untested instantiation in p2... (diff) | |
| download | p2pvr-90e8a2a45041cb2099b9ba1113404fda5338462c.tar.bz2 p2pvr-90e8a2a45041cb2099b9ba1113404fda5338462c.tar.xz p2pvr-90e8a2a45041cb2099b9ba1113404fda5338462c.zip | |
Slicer compat fix
Diffstat (limited to 'libtmdb')
| -rw-r--r-- | libtmdb/httpClient.h | 2 | ||||
| -rw-r--r-- | libtmdb/testModels.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libtmdb/httpClient.h b/libtmdb/httpClient.h index 1b50b7e..4f35937 100644 --- a/libtmdb/httpClient.h +++ b/libtmdb/httpClient.h @@ -50,7 +50,7 @@ namespace TMDb { GetData(const std::string & pathFormat, const Params & ... params, const Parameters & parameters) const { json::Value data = FetchJson(GetUrl<Params...>(pathFormat, params..., parameters)); - return Slicer::Deserialize<Slicer::JsonValue, ReturnModel>(data); + return Slicer::Deserialize<Slicer::JsonValueDeserializer, ReturnModel>(data); } static void packParams(boost::format &); diff --git a/libtmdb/testModels.cpp b/libtmdb/testModels.cpp index 19e1df7..6d87c8f 100644 --- a/libtmdb/testModels.cpp +++ b/libtmdb/testModels.cpp @@ -16,7 +16,7 @@ namespace std { BOOST_AUTO_TEST_CASE( deserialize_searchmulti_json ) { - auto results = Slicer::Deserialize<Slicer::JsonFile, TMDb::SearchMultiResults>("samples/searchMulti_breakingBad.json"); + auto results = Slicer::Deserialize<Slicer::JsonFileDeserializer, TMDb::SearchMultiResults>("samples/searchMulti_breakingBad.json"); BOOST_REQUIRE_EQUAL(1, results->Page); BOOST_REQUIRE_EQUAL(1, results->TotalPages); BOOST_REQUIRE_EQUAL(3, results->TotalResults); @@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE( deserialize_searchmulti_json ) BOOST_AUTO_TEST_CASE( deserialize_movie_json ) { - auto movie = Slicer::Deserialize<Slicer::JsonFile, TMDb::Movie>("samples/movie_550.json"); + auto movie = Slicer::Deserialize<Slicer::JsonFileDeserializer, TMDb::Movie>("samples/movie_550.json"); BOOST_REQUIRE_EQUAL(550, movie->Id); BOOST_REQUIRE_EQUAL(false, movie->Adult); BOOST_REQUIRE_EQUAL("/8uO0gUM8aNqYLs1OsTBQiXu0fEv.jpg", movie->BackdropPath); @@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE( deserialize_movie_json ) BOOST_AUTO_TEST_CASE( deserialize_tvseries_json ) { - auto tvSeries = Slicer::Deserialize<Slicer::JsonFile, TMDb::TvSeries>("samples/tv_1396.json"); + auto tvSeries = Slicer::Deserialize<Slicer::JsonFileDeserializer, TMDb::TvSeries>("samples/tv_1396.json"); BOOST_REQUIRE_EQUAL("/sIJyCJedGlZf1TId41gCtkblBGo.jpg", tvSeries->BackdropPath); BOOST_REQUIRE_EQUAL(1, tvSeries->CreatedBy.size()); BOOST_REQUIRE_EQUAL(66633, tvSeries->CreatedBy.front().Id); |