aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-12-08 23:15:21 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-12-15 23:08:50 -0800
commit21163e764db5aa8bfcb21d2222421a19ded246a0 (patch)
tree0b508bfe227a0e1cad7e4020bccc0644b7058a14 /paludis
parente2e7c995c0ae9615707c45e7b3012a4cd6ea0d1b (diff)
downloadpaludis-21163e764db5aa8bfcb21d2222421a19ded246a0.tar.gz
paludis-21163e764db5aa8bfcb21d2222421a19ded246a0.tar.xz
build: assume full C++11 support
paludis requires C++11 support. Remove checks and compatibility code to permit building with partial C++11 support. This mostly removes the configure checks for support for C++11 features. noexcept and std::next (part of the C++11 standard library) had compatibility code which is no longer exercised and should be safe to excise. Signed-off-by: Saleem Abdulrasool <compnerd@compnerd.org>
Diffstat (limited to 'paludis')
-rw-r--r--paludis/util/attributes.hh6
-rw-r--r--paludis/util/iterator_funcs.hh27
-rw-r--r--paludis/util/process.cc2
-rw-r--r--paludis/util/process.hh2
-rw-r--r--paludis/util/safe_ofstream.cc2
-rw-r--r--paludis/util/safe_ofstream.hh2
6 files changed, 4 insertions, 37 deletions
diff --git a/paludis/util/attributes.hh b/paludis/util/attributes.hh
index 4fe4cef82..fa0f0302d 100644
--- a/paludis/util/attributes.hh
+++ b/paludis/util/attributes.hh
@@ -72,12 +72,6 @@
# define PALUDIS_HIDDEN
#endif
-#if defined(PALUDIS_HAVE_NOEXCEPT)
-# define PALUDIS_NOEXCEPT(x) noexcept(x)
-#else
-# define PALUDIS_NOEXCEPT(x)
-#endif
-
#define PALUDIS_TLS static __thread
#endif
diff --git a/paludis/util/iterator_funcs.hh b/paludis/util/iterator_funcs.hh
index e72628478..7709549f5 100644
--- a/paludis/util/iterator_funcs.hh
+++ b/paludis/util/iterator_funcs.hh
@@ -25,34 +25,7 @@
namespace paludis
{
-#ifdef PALUDIS_HAVE_STD_NEXT
using std::next;
-#else
- /**
- * Return a new iterator pointing to the item after i.
- *
- * \ingroup g_iterator
- */
- template <typename T_>
- T_ next(const T_ & i)
- {
- T_ result(i);
- return ++result;
- }
-
- /**
- * Return a new iterator advanced by a distance of n.
- *
- * \ingroup g_iterator
- */
- template <typename T_>
- T_ next(const T_ & i, const int & n)
- {
- T_ result(i);
- std::advance(result, n);
- return result;
- }
-#endif
/**
* Return a new iterator pointing to the item before i.
diff --git a/paludis/util/process.cc b/paludis/util/process.cc
index 0a5a31274..7b4356f97 100644
--- a/paludis/util/process.cc
+++ b/paludis/util/process.cc
@@ -1018,7 +1018,7 @@ RunningProcessHandle::RunningProcessHandle(pid_t p, std::unique_ptr<RunningProce
{
}
-RunningProcessHandle::~RunningProcessHandle() PALUDIS_NOEXCEPT(false)
+RunningProcessHandle::~RunningProcessHandle() noexcept(false)
{
if (-1 != _imp->pid)
{
diff --git a/paludis/util/process.hh b/paludis/util/process.hh
index 5cebe8c97..108a239b7 100644
--- a/paludis/util/process.hh
+++ b/paludis/util/process.hh
@@ -125,7 +125,7 @@ namespace paludis
const pid_t,
std::unique_ptr<RunningProcessThread> &&);
- ~RunningProcessHandle() PALUDIS_NOEXCEPT(false);
+ ~RunningProcessHandle() noexcept(false);
RunningProcessHandle(RunningProcessHandle &&);
RunningProcessHandle(const RunningProcessHandle &) = delete;
diff --git a/paludis/util/safe_ofstream.cc b/paludis/util/safe_ofstream.cc
index 7861572df..9f23390b3 100644
--- a/paludis/util/safe_ofstream.cc
+++ b/paludis/util/safe_ofstream.cc
@@ -138,7 +138,7 @@ SafeOFStream::SafeOFStream(const FSPath & p, const int open_flags, const bool b)
{
}
-SafeOFStream::~SafeOFStream() PALUDIS_NOEXCEPT(false)
+SafeOFStream::~SafeOFStream() noexcept(false)
{
buf.write_buffered();
diff --git a/paludis/util/safe_ofstream.hh b/paludis/util/safe_ofstream.hh
index 221ff1e40..83b7eca38 100644
--- a/paludis/util/safe_ofstream.hh
+++ b/paludis/util/safe_ofstream.hh
@@ -118,7 +118,7 @@ namespace paludis
SafeOFStream(const int fd, const bool buffer);
SafeOFStream(const FSPath &, const int open_flags, const bool buffer);
- ~SafeOFStream() PALUDIS_NOEXCEPT(false);
+ ~SafeOFStream() noexcept(false);
///\}
};