From 843aa7cd65985319a64d4f1297778f93f96a5008 Mon Sep 17 00:00:00 2001
From: Marvin Greenberg <public.marvin@gmail.com>
Date: Thu, 30 Jan 2014 16:37:07 -0500
Subject: Work around differences in clang libc++
 std::vector<bool>::const_reference

clang++ using -stdlib=libc++ defines const_reference as a class,
to map boolean vectors onto a bit set.  Because swig does
not "see" the type as "const &" it generates incorrect code for this case,
generating a declaration like:

  const_reference result;

When const_reference is a typedef to 'bool' as is the case with stdlibc++
this works.  When this is actually a constant reference, this is clearly
invalid since it is not initialized.  For libc++, this is a class
which cannot be default constructed, resulting in an error.  The fix
is to explicitly define the various accessor extensions as having a
bool return type for this specialization.
---
 Lib/d/std_vector.i | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Lib/d')

diff --git a/Lib/d/std_vector.i b/Lib/d/std_vector.i
index b7d4e223f..50942f289 100644
--- a/Lib/d/std_vector.i
+++ b/Lib/d/std_vector.i
@@ -128,7 +128,7 @@ public void capacity(size_t value) {
         return $self->capacity() - $self->size();
       }
 
-      const_reference remove() throw (std::out_of_range) {
+      CONST_REFERENCE remove() throw (std::out_of_range) {
         if ($self->empty()) {
           throw std::out_of_range("Tried to remove last element from empty vector.");
         }
@@ -138,7 +138,7 @@ public void capacity(size_t value) {
         return value;
       }
 
-      const_reference remove(size_type index) throw (std::out_of_range) {
+      CONST_REFERENCE remove(size_type index) throw (std::out_of_range) {
         if (index >= $self->size()) {
           throw std::out_of_range("Tried to remove element with invalid index.");
         }
@@ -153,7 +153,7 @@ public void capacity(size_t value) {
     // Wrappers for setting/getting items with the possibly thrown exception
     // specified (important for SWIG wrapper generation).
     %extend {
-      const_reference getElement(size_type index) throw (std::out_of_range) {
+      CONST_REFERENCE getElement(size_type index) throw (std::out_of_range) {
         if ((index < 0) || ($self->size() <= index)) {
           throw std::out_of_range("Tried to get value of element with invalid index.");
         }
@@ -464,7 +464,7 @@ int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg)
         return pv;
       }
 
-      const_reference remove() throw (std::out_of_range) {
+      CONST_REFERENCE remove() throw (std::out_of_range) {
         if ($self->empty()) {
           throw std::out_of_range("Tried to remove last element from empty vector.");
         }
@@ -474,7 +474,7 @@ int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg)
         return value;
       }
 
-      const_reference remove(size_type index) throw (std::out_of_range) {
+      CONST_REFERENCE remove(size_type index) throw (std::out_of_range) {
         if (index >= $self->size()) {
           throw std::out_of_range("Tried to remove element with invalid index.");
         }
@@ -506,7 +506,7 @@ int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg)
     // Wrappers for setting/getting items with the possibly thrown exception
     // specified (important for SWIG wrapper generation).
     %extend {
-      const_reference getElement(size_type index) throw (std::out_of_range) {
+      CONST_REFERENCE getElement(size_type index) throw (std::out_of_range) {
         if ((index < 0) || ($self->size() <= index)) {
           throw std::out_of_range("Tried to get value of element with invalid index.");
         }
-- 
cgit v1.2.1