diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-03 21:50:40 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-03 21:50:40 +0000 |
commit | 3dfdf5ef0405474dbd4084e1aafdc44d9b1d49e4 (patch) | |
tree | 14735aa7faf4b848889713fc153382af269a7344 /cpp/sca/test/store-function/catalog.hpp | |
parent | b2b06bd2780dc40f666201d095c388313364b37a (diff) |
Removed explicit C++ keywords to let the compiler perform the necessary conversions.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@821426 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/sca/test/store-function/catalog.hpp')
-rw-r--r-- | cpp/sca/test/store-function/catalog.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/sca/test/store-function/catalog.hpp b/cpp/sca/test/store-function/catalog.hpp index 82a69e2bbd..7bf54231a7 100644 --- a/cpp/sca/test/store-function/catalog.hpp +++ b/cpp/sca/test/store-function/catalog.hpp @@ -33,20 +33,20 @@ namespace store std::string catalog_currencyCode = "USD"; double catalog_convert(const service& currencyConverter, const double price) { - return currencyConverter(makeList(tuscany::value("convert"), tuscany::value("USD"), tuscany::value(catalog_currencyCode), tuscany::value(price))); + return currencyConverter(tuscany::makeList<tuscany::value>("convert", "USD", catalog_currencyCode, price)); } const tuscany::list<ItemType> catalog_get(const service& currencyConverter) { - const std::string currencySymbol = currencyConverter_service(makeList(tuscany::value("getSymbol"), tuscany::value(catalog_currencyCode))); - return makeList( + const std::string currencySymbol = currencyConverter_service(tuscany::makeList<tuscany::value>("getSymbol", catalog_currencyCode)); + return tuscany::makeList( makeItem("Apple", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 2.99)), makeItem("Orange", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 3.55)), makeItem("Pear", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 1.55))); } const tuscany::value catalog_service(const service& currencyConverter, const tuscany::list<tuscany::value>& args) { - if (car(args) == tuscany::value("get")) - return tuscany::value(catalog_get(currencyConverter)); + if (car(args) == "get") + return catalog_get(currencyConverter); return tuscany::value(); } |