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

1 files changed, 7 insertions, 7 deletions

diff --git a/sca-cpp/trunk/samples/store-scheme/script-test.cpp b/sca-cpp/trunk/samples/store-scheme/script-test.cpp
index 0d5a9ccf9d..676865e771 100644
--- a/sca-cpp/trunk/samples/store-scheme/script-test.cpp
+++ b/sca-cpp/trunk/samples/store-scheme/script-test.cpp
@@ -28,16 +28,16 @@
 #include "stream.hpp"
 #include "string.hpp"
 #include "list.hpp"
-#include "xml.hpp"
-#include "../../modules/scheme/driver.hpp"
+#include "../../modules/xml/xml.hpp"
 #include "../../modules/json/json.hpp"
+#include "../../modules/scheme/driver.hpp"
 
 namespace store {
 
 using namespace tuscany;
 
-bool testScript() {
-    gc_scoped_pool pool;
+const bool testScript() {
+    const gc_scoped_pool pool;
 
     ifstream is("script-test.scm");
     ostringstream os;
@@ -49,9 +49,9 @@ bool testScript() {
     return true;
 }
 
-bool testEval() {
+const bool testEval() {
     {
-        gc_scoped_pool pool;
+        const gc_scoped_pool pool;
         ifstream is("script-test.scm");
         ostringstream os;
         scheme::setupDisplay(os);
@@ -65,7 +65,7 @@ bool testEval() {
     }
 
     {
-        gc_scoped_pool pool;
+        const gc_scoped_pool pool;
         ifstream is("script-test.scm");
         ostringstream os;
         scheme::setupDisplay(os);