atria-soft/ejson
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

[CI] update travis.yml

Browse Source
This commit is contained in:
Edouard DUPIN 2016-04-28 23:21:58 +02:00
parent 22b869e2d0
commit a6865bfa43
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -70,10 +70,11 @@ after_script:
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/ejson/; ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/ejson/;
fi fi
- ./out/Linux_x86_64/$CONF/staging/$BUILDER/ejson-test/ejson-test.app/bin/ejson-test --etk-log-level=3 | tee out_test.txt - if [ "$GCOV" == "" ]; then
- if [ "$GCOV" != "" ]; then ./out/Linux_x86_64/$CONF/staging/$BUILDER/ejson-test/ejson-test.app/bin/ejson-test --elog-level=3 | tee out_test.txt
else
./ci/test_send.py --file=out_test.txt; ./ci/test_send.py --file=out_test.txt;
lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p ejson?gcov; lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p ejson-*?build?run ejson?gcov;
./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/ejson/ejson_coverage.json; ./ci/coverage_send.py --json=out/Linux_x86_64/$CONF/build/$BUILDER/ejson/ejson_coverage.json;
fi fi

2
ejson/Array.cpp
View File

@ -112,7 +112,7 @@ template class ejson::iterator<ejson::Array>;
// Not implemented ==> force link error ... // Not implemented ==> force link error ...
/* /*
template<> template<>
std::string ejson::iterator<ejson::Array>::getKey() { std::string ejson::iterator<ejson::Array>::getKey() const noexcept {
return m_data.getKey(m_id); return m_data.getKey(m_id);
} }
*/ */

6
ejson/Document.cpp
View File

@ -67,7 +67,7 @@ bool ejson::Document::store(const std::string& _file) {
return static_cast<ejson::internal::Document*>(m_data.get())->store(_file); return static_cast<ejson::internal::Document*>(m_data.get())->store(_file);
} }
void setDisplayError(bool _value){ void ejson::Document::setDisplayError(bool _value){
if (m_data == nullptr) { if (m_data == nullptr) {
EJSON_ERROR("Can not setDisplayError (nullptr) ..."); EJSON_ERROR("Can not setDisplayError (nullptr) ...");
return; return;
@ -75,12 +75,12 @@ void setDisplayError(bool _value){
static_cast<ejson::internal::Document*>(m_data.get())->setDisplayError(_value); static_cast<ejson::internal::Document*>(m_data.get())->setDisplayError(_value);
} }
bool getDisplayError() { bool ejson::Document::getDisplayError() {
if (m_data == nullptr) { if (m_data == nullptr) {
EJSON_ERROR("Can not getDisplayError (nullptr) ..."); EJSON_ERROR("Can not getDisplayError (nullptr) ...");
return false; return false;
} }
return static_cast<ejson::internal::Document*>(m_data.get())->getDisplayError(_value); return static_cast<ejson::internal::Document*>(m_data.get())->getDisplayError();
} }
void ejson::Document::displayError() { void ejson::Document::displayError() {

9
ejson/Object.cpp
View File

@ -159,9 +159,10 @@ const ejson::Object::iterator ejson::Object::end() const {
#include <ejson/details/iterator.hxx> #include <ejson/details/iterator.hxx>
template class ejson::iterator<ejson::Object>; template class ejson::iterator<ejson::Object>;
namespace ejson {
template<> template<>
std::string ejson::iterator<ejson::Object>::getKey() { std::string iterator<ejson::Object>::getKey() const noexcept {
return m_data.getKey(m_id); return m_data.getKey(m_id);
}
} }

4
ejson/internal/Document.h
View File

@ -69,9 +69,7 @@ namespace ejson {
* @brief Set the display of the error when detected. * @brief Set the display of the error when detected.
* @param[in] _value true: display error, false not display error (get it at end) * @param[in] _value true: display error, false not display error (get it at end)
*/ */
void setDisplayError(bool _value) { void setDisplayError(bool _value);
m_writeErrorWhenDetexted = _value;
};
/** /**
* @brief Get the display of the error status. * @brief Get the display of the error status.
* @return true Display error * @return true Display error

2
ejson/iterator.h
View File

@ -120,6 +120,6 @@ namespace ejson {
* @brief Get Key of an element * @brief Get Key of an element
* @return Key of the Element * @return Key of the Element
*/ */
std::string getKey(); std::string getKey() const noexcept;
}; };
} }