diff --git a/.travis.yml b/.travis.yml index 39ee5821..608e8985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,17 @@ notifications: before_install: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update - - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi + - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8 libboost-dev-all; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi install: + - git clone https://github.com/boostorg/preprocessor.git + - cd preprocessor + - git checkout tags/boost-1.50.0 + - cp -rf include/boost/* /usr/include/boost/ + - ls -l /usr/include/boost/preprocessor/tuple + - sed 's|104600|105000|' -i /usr/include/boost/version.hpp - "mkdir -p $TRAVIS_BUILD_DIR/build/scripts" - "cd $TRAVIS_BUILD_DIR/build/scripts" - "cmake $TRAVIS_BUILD_DIR" diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 1746d99e..4db91ca9 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -11,7 +11,7 @@ build(insert) build(update) build(remove) build(select) -find_package(Boost 1.54) +find_package(Boost 1.50) if(Boost_FOUND) MESSAGE(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS}) diff --git a/examples/ppgen.cpp b/examples/ppgen.cpp index 4c4d01a5..68889893 100644 --- a/examples/ppgen.cpp +++ b/examples/ppgen.cpp @@ -26,11 +26,17 @@ #if 0 // syntax example SQLPP_DECLARE_TABLE( - (table, DROP_IF_EXISTS, CREATE_IF_NOT_EXISTS, ENGINE("InnoDB"), CHARACTER_SET("utf-8"), COMMENT("table comments")) + (table, \ + SQLPP_DROP_IF_EXISTS \ + ,SQLPP_CREATE_IF_NOT_EXISTS \ + ,SQLPP_ENGINE("InnoDB") \ + ,SQLPP_CHARACTER_SET("utf-8") \ + ,SQLPP_COMMENT("table comments") \ + ) , - (id, int, NOT_NULL, PRIMARY_KEY, AUTO_INCREMENT) - (name, varchar(64), NOT_NULL, INDEX("name_index"), DEFAULT("any name")) - (age, int, NOT_NULL, INDEX("age_index"), UNIQUE, COMMENT("some comments")) + (id, int, SQLPP_NOT_NULL, SQLPP_PRIMARY_KEY, SQLPP_AUTO_INCREMENT) + (name, varchar(64), SQLPP_NOT_NULL, SQLPP_INDEX("name_index"), SQLPP_DEFAULT("any name")) + (age, int, SQLPP_NOT_NULL, SQLPP_INDEX("age_index"), SQLPP_UNIQUE, SQLPP_COMMENT("some comments")) ) #endif