From 639eaa676ed5d8abce8294779f619fcb37dc5029 Mon Sep 17 00:00:00 2001 From: mutouyun Date: Tue, 15 Jan 2019 23:20:50 +0800 Subject: [PATCH] qmake error --- .travis.yml | 1 - src/platform/waiter_linux.h | 6 ++++-- src/platform/waiter_win.h | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 034478f..1a39323 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ script: 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; - cat MakefileTest; make; make -f MakefileTest; export IPC_TARGET=test; diff --git a/src/platform/waiter_linux.h b/src/platform/waiter_linux.h index 711db39..fcc3565 100644 --- a/src/platform/waiter_linux.h +++ b/src/platform/waiter_linux.h @@ -1,6 +1,7 @@ #pragma once -namespace ipc::detail { +namespace ipc { +namespace detail { class waiter { public: @@ -29,4 +30,5 @@ public: } }; -} // namespace ipc::detail +} // namespace detail +} // namespace ipc diff --git a/src/platform/waiter_win.h b/src/platform/waiter_win.h index 5228adc..ab0b046 100644 --- a/src/platform/waiter_win.h +++ b/src/platform/waiter_win.h @@ -9,7 +9,8 @@ #include "rw_lock.h" #include "platform/to_tchar.h" -namespace ipc::detail { +namespace ipc { +namespace detail { class waiter { std::atomic counter_ { 0 }; @@ -52,4 +53,5 @@ public: } }; -} // namespace ipc::detail +} // namespace detail +} // namespace ipc