From 36adc76235fb0a38e7042bc751f988b71627e2a0 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Tue, 11 Dec 2012 06:13:02 +0000 Subject: Changes to get successful C++11 based build. Code cleanup, dependency upgrades, and const + inline optimizations in components, samples, and app hosting server. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1420007 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/components/cache/memcache.cpp | 51 +++++++++++------------------ 1 file changed, 19 insertions(+), 32 deletions(-) (limited to 'sca-cpp/trunk/components/cache/memcache.cpp') diff --git a/sca-cpp/trunk/components/cache/memcache.cpp b/sca-cpp/trunk/components/cache/memcache.cpp index 738a6ddd5a..2e4597efd3 100644 --- a/sca-cpp/trunk/components/cache/memcache.cpp +++ b/sca-cpp/trunk/components/cache/memcache.cpp @@ -37,14 +37,14 @@ namespace cache { /** * Get an item from the cache. */ -const failable get(const list& params, memcache::MemCached& ch) { +const failable get(const list& params, const memcache::MemCached& ch) { return memcache::get(car(params), ch); } /** * Post an item to the cache. */ -const failable post(const list& params, memcache::MemCached& ch) { +const failable post(const list& params, const memcache::MemCached& ch) { const value id = append(car(params), mklist(mkuuid())); const failable val = memcache::post(id, cadr(params), ch); if (!hasContent(val)) @@ -55,7 +55,7 @@ const failable post(const list& params, memcache::MemCached& ch) { /** * Put an item into the cache. */ -const failable put(const list& params, memcache::MemCached& ch) { +const failable put(const list& params, const memcache::MemCached& ch) { const failable val = memcache::put(car(params), cadr(params), ch); if (!hasContent(val)) return mkfailure(val); @@ -65,45 +65,20 @@ const failable put(const list& params, memcache::MemCached& ch) { /** * Delete an item from the cache. */ -const failable del(const list& params, memcache::MemCached& ch) { +const failable del(const list& params, const memcache::MemCached& ch) { const failable val = memcache::del(car(params), ch); if (!hasContent(val)) return mkfailure(val); return value(content(val)); } -/** - * Component implementation lambda function. - */ -class applyCache { -public: - applyCache(memcache::MemCached& ch) : ch(ch) { - } - - const value operator()(const list& params) const { - const value func(car(params)); - if (func == "get") - return get(cdr(params), ch); - if (func == "post") - return post(cdr(params), ch); - if (func == "put") - return put(cdr(params), ch); - if (func == "delete") - return del(cdr(params), ch); - return mkfailure(); - } - -private: - memcache::MemCached& ch; -}; - /** * Convert a list of properties to a list of server addresses. */ const list servers(const list& params) { if (isNil(params)) return list(); - const value s = ((lambda&)>)car(params))(list()); + const value s = ((lvvlambda)car(params))(nilListValue); return cons(s, servers(cdr(params))); } @@ -112,10 +87,22 @@ const list servers(const list& params) { */ const failable start(const list& params) { // Connect to memcached - memcache::MemCached& ch = *(new (gc_new()) memcache::MemCached(servers(params))); + const memcache::MemCached& ch = *(new (gc_new()) memcache::MemCached(servers(params))); // Return the component implementation lambda function - return value(lambda&)>(applyCache(ch))); + const lvvlambda applyCache = [ch](const list& params) -> const value { + const value func(car(params)); + if (func == "get") + return get(cdr(params), ch); + if (func == "post") + return post(cdr(params), ch); + if (func == "put") + return put(cdr(params), ch); + if (func == "delete") + return del(cdr(params), ch); + return mkfailure(); + }; + return value(applyCache); } } -- cgit v1.2.3