aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch')
-rw-r--r--debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch b/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
index 60f33ce3f..0eead3d5d 100644
--- a/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
+++ b/debian/patches/0605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full+lite.patch
@@ -13,9 +13,9 @@ Abstract:
The attached patch fixes these compilation issues by not overriding the
clear() method when compiling against libc++, since the libc++ headers
seem to do essentially the same as the overriden method.
---- a/nxcomp/Types.h 2013-11-05 01:35:22.000000000 +0100
-+++ b/nxcomp/Types.h 2013-11-05 01:37:30.000000000 +0100
-@@ -55,6 +55,9 @@
+--- a/nxcomp/Types.h
++++ b/nxcomp/Types.h
+@@ -55,6 +55,9 @@ class T_data : public vector < unsigned
return &*(vector < unsigned char >::begin());
}
@@ -25,7 +25,7 @@ Abstract:
void clear()
{
#if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -95,12 +98,16 @@
+@@ -95,12 +98,16 @@ class T_data : public vector < unsigned
#endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
}
@@ -42,7 +42,7 @@ Abstract:
void clear()
{
#if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -141,6 +148,7 @@
+@@ -141,6 +148,7 @@ class T_messages : public vector < Messa
#endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
}