From 269299d9131934f413ae82e0bae9d6574febfe65 Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Fri, 28 Oct 2011 17:00:56 +0200 Subject: [PATCH] Remove sg_sleep.*. --- projects/VC90/SimGear.vcproj | 8 ----- simgear/misc/CMakeLists.txt | 2 -- simgear/misc/Makefile.am | 6 ++-- simgear/misc/sg_sleep.cxx | 60 ------------------------------------ simgear/misc/sg_sleep.hxx | 41 ------------------------ 5 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 simgear/misc/sg_sleep.cxx delete mode 100644 simgear/misc/sg_sleep.hxx diff --git a/projects/VC90/SimGear.vcproj b/projects/VC90/SimGear.vcproj index 6c244843..f3d50894 100644 --- a/projects/VC90/SimGear.vcproj +++ b/projects/VC90/SimGear.vcproj @@ -671,14 +671,6 @@ RelativePath="..\..\simgear\misc\sg_path.hxx" > - - - - diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt index 7a06f3bd..43904321 100644 --- a/simgear/misc/CMakeLists.txt +++ b/simgear/misc/CMakeLists.txt @@ -7,7 +7,6 @@ set(HEADERS interpolator.hxx sg_dir.hxx sg_path.hxx - sg_sleep.hxx sgstream.hxx stdint.hxx stopwatch.hxx @@ -24,7 +23,6 @@ set(SOURCES interpolator.cxx sg_dir.cxx sg_path.cxx - sg_sleep.cxx sgstream.cxx strutils.cxx tabbed_values.cxx diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am index ae696e79..e671418a 100644 --- a/simgear/misc/Makefile.am +++ b/simgear/misc/Makefile.am @@ -14,8 +14,7 @@ include_HEADERS = \ stdint.hxx \ PathOptions.hxx \ sg_dir.hxx \ - ResourceManager.hxx \ - sg_sleep.hxx + ResourceManager.hxx libsgmisc_a_SOURCES = \ sg_path.cxx \ @@ -27,8 +26,7 @@ libsgmisc_a_SOURCES = \ interpolator.cxx \ PathOptions.cxx \ sg_dir.cxx \ - ResourceManager.cxx \ - sg_sleep.cxx + ResourceManager.cxx #noinst_PROGRAMS = tabbed_value_test swap_test diff --git a/simgear/misc/sg_sleep.cxx b/simgear/misc/sg_sleep.cxx deleted file mode 100644 index a52880c5..00000000 --- a/simgear/misc/sg_sleep.cxx +++ /dev/null @@ -1,60 +0,0 @@ - -// Written by James Turner, started July 2010. -// -// Copyright (C) 2010 Curtis L. Olson - http://www.flightgear.org/~curt -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// $Id$ - -#include - -#ifdef SG_WINDOWS -# include -#else -# include -#endif - -namespace simgear -{ - -#ifdef SG_WINDOWS - -void sleepForSeconds(int seconds) -{ - Sleep(1000 * seconds); -} - -void sleepForMSec(int msec) -{ - Sleep(msec); -} - -#else - -void sleepForSeconds(int seconds) -{ - ::sleep(seconds); -} - -void sleepForMSec(int msec) -{ - ::usleep(msec * 1000); -} - -#endif - -} // of namespace simhear - diff --git a/simgear/misc/sg_sleep.hxx b/simgear/misc/sg_sleep.hxx deleted file mode 100644 index 389fdff3..00000000 --- a/simgear/misc/sg_sleep.hxx +++ /dev/null @@ -1,41 +0,0 @@ - -// Written by James Turner, started July 2010. -// -// Copyright (C) 2010 Curtis L. Olson - http://www.flightgear.org/~curt -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library 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 -// Library General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// $Id$ - - -#ifndef _SG_SLEEP_HXX -#define _SG_SLEEP_HXX - - -#include - - -namespace simgear -{ - -void sleepForSeconds(int seconds); - -void sleepForMSec(int msec); - -} // of namespace simgear - -#endif // _SG_SLEEP_HXX - - -- 2.39.2