From 89c6623c0e40257f1da0b7637fc329aa5cf2388c Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sat, 30 May 2020 22:01:38 +0300 Subject: [PATCH] lib/common: Remove no longer used stdexcept.h --- src/lib/arch/XArch.h | 2 +- src/lib/barrier/PlatformScreen.h | 1 - src/lib/barrier/StreamChunker.cpp | 2 +- src/lib/base/XBase.h | 2 +- src/lib/client/Client.cpp | 2 +- src/lib/common/stdexcept.h | 23 ----------------------- src/lib/server/Server.cpp | 3 +-- src/test/global/TestEventQueue.cpp | 2 +- src/test/integtests/net/NetworkTests.cpp | 2 +- 9 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 src/lib/common/stdexcept.h diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h index 787ad772..8484d060 100644 --- a/src/lib/arch/XArch.h +++ b/src/lib/arch/XArch.h @@ -20,7 +20,7 @@ #include "common/common.h" #include "common/stdstring.h" -#include "common/stdexcept.h" +#include //! Generic thread exception /*! diff --git a/src/lib/barrier/PlatformScreen.h b/src/lib/barrier/PlatformScreen.h index 82cbfaa6..f8d0cf98 100644 --- a/src/lib/barrier/PlatformScreen.h +++ b/src/lib/barrier/PlatformScreen.h @@ -20,7 +20,6 @@ #include "barrier/IPlatformScreen.h" #include "barrier/DragInformation.h" -#include "common/stdexcept.h" //! Base screen implementation /*! diff --git a/src/lib/barrier/StreamChunker.cpp b/src/lib/barrier/StreamChunker.cpp index 8b8971c0..579d02ff 100644 --- a/src/lib/barrier/StreamChunker.cpp +++ b/src/lib/barrier/StreamChunker.cpp @@ -29,9 +29,9 @@ #include "base/Log.h" #include "base/Stopwatch.h" #include "base/String.h" -#include "common/stdexcept.h" #include +#include using namespace std; diff --git a/src/lib/base/XBase.h b/src/lib/base/XBase.h index addfd854..59b700e5 100644 --- a/src/lib/base/XBase.h +++ b/src/lib/base/XBase.h @@ -18,7 +18,7 @@ #pragma once -#include "common/stdexcept.h" +#include #include //! Exception base class diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index 84476816..96d2c67b 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -38,11 +38,11 @@ #include "base/IEventQueue.h" #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" -#include "common/stdexcept.h" #include #include #include +#include #include // diff --git a/src/lib/common/stdexcept.h b/src/lib/common/stdexcept.h deleted file mode 100644 index 70e3eb8c..00000000 --- a/src/lib/common/stdexcept.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * barrier -- mouse and keyboard sharing utility - * Copyright (C) 2014-2016 Symless Ltd. - * - * This package is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * found in the file LICENSE that should have accompanied this file. - * - * This package is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -// apple declares _NOEXCEPT -#ifndef _NOEXCEPT -# define _NOEXCEPT noexcept -#endif diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index c8e234de..234dda6c 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -43,14 +43,13 @@ #include "base/IEventQueue.h" #include "base/Log.h" #include "base/TMethodEventJob.h" -#include "common/stdexcept.h" #include #include #include #include #include - +#include // // Server // diff --git a/src/test/global/TestEventQueue.cpp b/src/test/global/TestEventQueue.cpp index d2029228..4dd01e7d 100644 --- a/src/test/global/TestEventQueue.cpp +++ b/src/test/global/TestEventQueue.cpp @@ -20,7 +20,7 @@ #include "base/Log.h" #include "base/TMethodEventJob.h" #include "base/SimpleEventQueueBuffer.h" -#include "common/stdexcept.h" +#include void TestEventQueue::raiseQuitEvent() diff --git a/src/test/integtests/net/NetworkTests.cpp b/src/test/integtests/net/NetworkTests.cpp index 4a9a9f0d..d404abc8 100644 --- a/src/test/integtests/net/NetworkTests.cpp +++ b/src/test/integtests/net/NetworkTests.cpp @@ -38,7 +38,7 @@ #include "base/TMethodEventJob.h" #include "base/TMethodJob.h" #include "base/Log.h" -#include "common/stdexcept.h" +#include #include "test/global/gtest.h" #include