From d8adbb5a18880e8f877cd91dd0666f815b377c1c Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 28 Jun 2011 14:57:27 -0400
Subject: [PATCH] * #6290: remove unused classes from utilspp
---
sflphone-common/libs/utilspp/EmptyType.hpp | 32 --------------
sflphone-common/libs/utilspp/Makefile.am | 3 --
sflphone-common/libs/utilspp/NonCopyable.hpp | 43 ------------------
.../libs/utilspp/ThreadingFactoryMutex.hpp | 44 -------------------
.../libs/utilspp/ThreadingFactoryMutex.inl | 37 ----------------
5 files changed, 159 deletions(-)
delete mode 100644 sflphone-common/libs/utilspp/EmptyType.hpp
delete mode 100644 sflphone-common/libs/utilspp/NonCopyable.hpp
delete mode 100644 sflphone-common/libs/utilspp/ThreadingFactoryMutex.hpp
delete mode 100644 sflphone-common/libs/utilspp/ThreadingFactoryMutex.inl
diff --git a/sflphone-common/libs/utilspp/EmptyType.hpp b/sflphone-common/libs/utilspp/EmptyType.hpp
deleted file mode 100644
index 1b0b3378e0..0000000000
--- a/sflphone-common/libs/utilspp/EmptyType.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_EMPTYTYPE_HPP
-#define UTILSPP_EMPTYTYPE_HPP
-
-namespace utilspp
-{
- struct EmptyType {};
-}
-
-#endif
diff --git a/sflphone-common/libs/utilspp/Makefile.am b/sflphone-common/libs/utilspp/Makefile.am
index 855888bb35..2852c54fc3 100644
--- a/sflphone-common/libs/utilspp/Makefile.am
+++ b/sflphone-common/libs/utilspp/Makefile.am
@@ -3,11 +3,8 @@ SUBDIRS = singleton
noinst_LTLIBRARIES = libutilspp.la
libutilspp_la_SOURCES = \
- EmptyType.hpp \
- NonCopyable.hpp \
NullType.hpp \
Singleton.hpp \
- ThreadingFactoryMutex.hpp ThreadingFactoryMutex.inl \
ThreadingSingle.hpp ThreadingSingle.inl
libutilspp_la_LIBADD = ./singleton/libsingleton.la
diff --git a/sflphone-common/libs/utilspp/NonCopyable.hpp b/sflphone-common/libs/utilspp/NonCopyable.hpp
deleted file mode 100644
index 2a684d136c..0000000000
--- a/sflphone-common/libs/utilspp/NonCopyable.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef UTILSPP_NONCOPYABLE_HPP
-#define UTILSPP_NONCOPYABLE_HPP
-
-namespace utilspp
-{
- class NonCopyable
- {
- protected:
- NonCopyable()
- {}
- ~NonCopyable()
- {}
-
- private:
- NonCopyable(const NonCopyable&);
- const NonCopyable& operator=(const NonCopyable&);
- };
-}
-
-#endif
diff --git a/sflphone-common/libs/utilspp/ThreadingFactoryMutex.hpp b/sflphone-common/libs/utilspp/ThreadingFactoryMutex.hpp
deleted file mode 100644
index 4ded82e7ad..0000000000
--- a/sflphone-common/libs/utilspp/ThreadingFactoryMutex.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef THREADING_FACTORY_MUTEX_HPP
-#define THREADING_FACTORY_MUTEX_HPP
-
-namespace utilspp
-{
- template < typename T >
- struct ThreadingFactoryMutex
- {
- struct lock
- {
- lock();
- lock( const T & );
- };
-
- typedef T VolatileType;
- };
-}
-
-#include "ThreadingFactoryMutex.inl"
-
-#endif
diff --git a/sflphone-common/libs/utilspp/ThreadingFactoryMutex.inl b/sflphone-common/libs/utilspp/ThreadingFactoryMutex.inl
deleted file mode 100644
index c9a9f62fbd..0000000000
--- a/sflphone-common/libs/utilspp/ThreadingFactoryMutex.inl
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) <2002-2004> <Jean-Philippe Barrette-LaPierre>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (cURLpp), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef THREADING_FACTORY_MUTEX_INL
-#define THREADING_FACTORY_MUTEX_INL
-
-template< typename T >
-inline
-utilspp::ThreadingSingle< T >::lock::lock()
-{};
-
-template< typename T >
-inline
-utilspp::ThreadingSingle< T >::lock::lock( const T & )
-{};
-
-#endif
\ No newline at end of file
--
GitLab