Skip to content
This repository has been archived by the owner on Jul 5, 2023. It is now read-only.

Commit

Permalink
Pulled in latest libscriptobject for ScriptItemPtr
Browse files Browse the repository at this point in the history
* Upgraded Travis build to 4.9
  • Loading branch information
craigminihan committed Nov 9, 2015
1 parent 43da74c commit 230f4ab
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Expand Up @@ -10,9 +10,9 @@ before_install:
- sudo apt-get update -qq

install:
- sudo apt-get install -qq g++-4.8 zlib1g-dev doxygen npm lcov ruby rubygems libtool
- export CC="gcc-4.8"
- export CXX="g++-4.8"
- sudo apt-get install -qq g++-4.9 zlib1g-dev doxygen npm lcov ruby rubygems libtool
- export CC="gcc-4.9"
- export CXX="g++-4.9"
- pushd ~
- mkdir Downloads
- cd Downloads
Expand All @@ -30,6 +30,6 @@ install:
- sudo rm -f /usr/bin/g++
- sudo rm -f /usr/bin/gcc
- sudo rm -f /usr/bin/gcov
- sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++
- sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
- sudo ln -s /usr/bin/gcov-4.8 /usr/bin/gcov
- sudo ln -s /usr/bin/g++-4.9 /usr/bin/g++
- sudo ln -s /usr/bin/gcc-4.9 /usr/bin/gcc
- sudo ln -s /usr/bin/gcov-4.9 /usr/bin/gcov
4 changes: 2 additions & 2 deletions src/avancedb/map_reduce.cpp
Expand Up @@ -207,9 +207,9 @@ map_reduce_result_array_ptr MapReduce::Execute(rs::jsapi::Runtime& rt, const Map
rs::jsapi::Value func(rt);
rt.Evaluate(mapScript.c_str(), func);

auto state = new MapReduceScriptObjectState{nullptr};
auto state = new MapReduceScriptObjectState{};

rs::scriptobject::ScriptObjectPtr scriptObj = nullptr;
rs::scriptobject::ScriptObjectPtr scriptObj;
rs::jsapi::Value object(rt);
rs::jsapi::DynamicObject::Create(rt,
[&](const char* name, rs::jsapi::Value& value) {
Expand Down
2 changes: 1 addition & 1 deletion src/avancedb/rest_server.cpp
Expand Up @@ -896,6 +896,6 @@ rs::scriptobject::ScriptObjectPtr RestServer::GetJsonBody(rs::httpserver::reques
throw InvalidJson();
}
} else {
return rs::scriptobject::ScriptObjectPtr(nullptr);
return rs::scriptobject::ScriptObjectPtr{};
}
}

0 comments on commit 230f4ab

Please sign in to comment.