From dd2c3b15e9def7818acc5ab42c43ba1d3f5569c1 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 14 Jan 2015 21:10:23 +0100 Subject: [PATCH] [DEV] error on the visibility of constructor --- .travis.yml | 10 ++++------ ejson/Number.h | 2 +- ejson/Object.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0a5336..014eb15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,11 +21,13 @@ before_script: - cd ewol; git submodule update; cd .. - cd ewol; git submodule foreach git checkout master; cd .. - cd ewol; git submodule foreach git pull; cd .. + - if [ "$CXX" == "clang++" ]; then BUILDER=clang; else BUILDER=gcc; fi #install Gcc to have lisstdc++ 4.8 & gcc 4.8 install: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -qq + - sudo apt-get install -qq libstdc++-4.9-dev - sudo apt-get install -qq g++-4.8 - sudo rm /usr/bin/gcc /usr/bin/g++ - sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc @@ -33,12 +35,8 @@ install: # build sequence with Lutin : script: - - if [ "$CXX" == "clang++" ]; then ./ewol/build/lutin.py -C -P -cclang -mdebug -p ejson_test; fi - - if [ "$CXX" == "g++" ]; then ./ewol/build/lutin.py -C -P -cgcc -mdebug -p ejson_test; fi - -after_script: - - if [ "$CXX" == "clang++" ]; then ./out/Linux_x86_64/debug/staging/clang/ejson_test/usr/bin/ejson_test; fi - - if [ "$CXX" == "g++" ]; then ./out/Linux_x86_64/debug/staging/gcc/ejson_test/usr/bin/ejson_test; fi + - ./ewol/build/lutin.py -C -P -c$BUILDER -mdebug -p ejson_test + - ./out/Linux_x86_64/debug/staging/$BUILDER/ejson_test/usr/bin/ejson_test #send e-mail on compilation result: notifications: diff --git a/ejson/Number.h b/ejson/Number.h index 0f1b89d..b5078e4 100644 --- a/ejson/Number.h +++ b/ejson/Number.h @@ -14,7 +14,7 @@ namespace ejson { class Number : public ejson::Value { - public: + protected: /** * @brief basic element of a xml structure */ diff --git a/ejson/Object.h b/ejson/Object.h index dd5e598..50e0cdc 100644 --- a/ejson/Object.h +++ b/ejson/Object.h @@ -16,7 +16,7 @@ namespace ejson { class Object : public ejson::Value { - public: + protected: /** * @brief basic element of a xml structure */