From 4adf62991e31a285a80ee622451df0dbc1eea5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E5=A4=B4=E4=BA=91?= <mark.lonr@tom.com>
Date: Fri, 18 Jan 2019 14:49:27 +0800
Subject: [PATCH 1/2] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bf7e039..b462c4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
   include:
     - compiler: gcc
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7 -std=gnu++1z"
+        - MATRIX_EVAL="CC=gcc-7 && CXX='g++-7 -std=gnu++1z'"
     - compiler: clang
     - compiler: clang
       env:

From 848cf7cfd8b2a68eaa6012871819aa398ebfc628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E5=A4=B4=E4=BA=91?= <mark.lonr@tom.com>
Date: Fri, 18 Jan 2019 14:55:35 +0800
Subject: [PATCH 2/2] Update .travis.yml

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b462c4c..24bc258 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
   include:
     - compiler: gcc
       env:
-        - MATRIX_EVAL="CC=gcc-7 && CXX='g++-7 -std=gnu++1z'"
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
     - compiler: clang
     - compiler: clang
       env:
@@ -31,8 +31,8 @@ script:
       make;
       export IPC_TARGET=test-ipc;
     else
-      qmake -o Makefile ipc.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX;
-      qmake -o MakefileTest test.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX;
+      qmake -o Makefile ipc.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CXXFLAGS+=-std=gnu++1z;
+      qmake -o MakefileTest test.pro QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_CXXFLAGS+=-std=gnu++1z;
       make;
       make -f MakefileTest;
       export IPC_TARGET=test;