From 36adc76235fb0a38e7042bc751f988b71627e2a0 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
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-test.cpp | 26 ++++++++----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'sca-cpp/trunk/components/cache/memcache-test.cpp')

diff --git a/sca-cpp/trunk/components/cache/memcache-test.cpp b/sca-cpp/trunk/components/cache/memcache-test.cpp
index 85fc339f1a..6c6adb0541 100644
--- a/sca-cpp/trunk/components/cache/memcache-test.cpp
+++ b/sca-cpp/trunk/components/cache/memcache-test.cpp
@@ -33,7 +33,7 @@ namespace tuscany {
 namespace memcache {
 
 bool testMemCached() {
-    MemCached ch(mklist<string>("localhost:11211", "localhost:11212", "localhost:11213"));
+    const MemCached ch(mklist<string>("localhost:11211", "localhost:11212", "localhost:11213"));
     const value k = mklist<value>("a");
 
     assert(hasContent(post(k, string("AAA"), ch)));
@@ -46,24 +46,16 @@ bool testMemCached() {
     return true;
 }
 
-struct getLoop {
-    const value k;
-    MemCached& ch;
-    getLoop(const value& k, MemCached& ch) : k(k), ch(ch) {
-    }
-    const bool operator()() const {
-        gc_scoped_pool p;
-        assert(get(k, ch) == value(string("CCC")));
-        return true;
-    }
-};
-
-bool testGetPerf() {
+const bool testGetPerf() {
     const value k = mklist<value>("c");
-    MemCached ch(mklist<string>("localhost:11211", "localhost:11212", "localhost:11213"));
+    const MemCached ch(mklist<string>("localhost:11211", "localhost:11212", "localhost:11213"));
     assert(hasContent(post(k, string("CCC"), ch)));
 
-    const lambda<bool()> gl = getLoop(k, ch);
+    const blambda gl = [k, ch]() -> const bool {
+        const gc_scoped_pool p;
+        assert(get(k, ch) == value(string("CCC")));
+        return true;
+    };
     cout << "Memcached get test " << time(gl, 5, 200) << " ms" << endl;
     return true;
 }
@@ -72,7 +64,7 @@ bool testGetPerf() {
 }
 
 int main() {
-    tuscany::gc_scoped_pool p;
+    const tuscany::gc_scoped_pool p;
     tuscany::cout << "Testing..." << tuscany::endl;
 
     tuscany::memcache::testMemCached();
-- 
cgit v1.2.3