diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-12-11 06:13:02 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-12-11 06:13:02 +0000 |
commit | 36adc76235fb0a38e7042bc751f988b71627e2a0 (patch) | |
tree | fc83b3f4e0afeb3932c8d200f5493f0a8d6c4619 /sca-cpp/trunk/samples/store-scheme | |
parent | 86b1de85536e93c59a25702a5a2d3e384202ffd2 (diff) |
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
Diffstat (limited to 'sca-cpp/trunk/samples/store-scheme')
-rw-r--r-- | sca-cpp/trunk/samples/store-scheme/Makefile.am | 2 | ||||
-rw-r--r-- | sca-cpp/trunk/samples/store-scheme/script-test.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sca-cpp/trunk/samples/store-scheme/Makefile.am b/sca-cpp/trunk/samples/store-scheme/Makefile.am index 2330d45422..36aa8ecb2d 100644 --- a/sca-cpp/trunk/samples/store-scheme/Makefile.am +++ b/sca-cpp/trunk/samples/store-scheme/Makefile.am @@ -25,6 +25,6 @@ EXTRA_DIST = script-test.scm dist_noinst_SCRIPTS = server-test noinst_PROGRAMS = script-test script_test_SOURCES = script-test.cpp -script_test_LDFLAGS = -lxml2 -lmozjs +script_test_LDFLAGS = -lxml2 -ljansson TESTS = script-test server-test 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); |