Open MPI logo

Open MPI Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Development mailing list

Subject: Re: [OMPI devel] [OMPI svn-full] svn:open-mpi r23998
From: Terry Dontje (terry.dontje_at_[hidden])
Date: 2010-11-08 06:18:18


In light of the push event changes upstream to libevent the changes to
libevent207.h probably should be modified to look like event.h. That is
wrap the include <stdbool.h> with some ifdef for C++. I did not do this
in the original fix because everything pulling it in was also pulling in
opal_config.h and getting stdbool.h in when it needed to.

Jeff, do you want me to change libevent207.h to the above?

--td

On 11/05/2010 02:58 PM, Jeff Squyres wrote:
> This patch should be pushed upstream to libevent.
>
> Terry / Ralph?
>
>
>
> On Nov 5, 2010, at 2:54 PM, tdd_at_[hidden] wrote:
>
>> Author: tdd
>> Date: 2010-11-05 14:54:19 EDT (Fri, 05 Nov 2010)
>> New Revision: 23998
>> URL: https://svn.open-mpi.org/trac/ompi/changeset/23998
>>
>> Log:
>> corrected stdbool.h inclusion to allow Oracle C++ compilers to work with OMPI
>> Text files modified:
>> trunk/opal/mca/event/libevent207/libevent/include/event2/event.h | 4 +++-
>> trunk/opal/mca/event/libevent207/libevent207.h | 3 ---
>> 2 files changed, 3 insertions(+), 4 deletions(-)
>>
>> Modified: trunk/opal/mca/event/libevent207/libevent/include/event2/event.h
>> ==============================================================================
>> --- trunk/opal/mca/event/libevent207/libevent/include/event2/event.h (original)
>> +++ trunk/opal/mca/event/libevent207/libevent/include/event2/event.h 2010-11-05 14:54:19 EDT (Fri, 05 Nov 2010)
>> @@ -45,7 +45,9 @@
>> #include<sys/time.h>
>> #endif
>> #ifndef WIN32
>> -#include<stdbool.h>
>> +# if !(defined(c_plusplus) || defined(__cplusplus))
>> +# include<stdbool.h>
>> +# endif
>> #endif
>>
>> #include<stdio.h>
>>
>> Modified: trunk/opal/mca/event/libevent207/libevent207.h
>> ==============================================================================
>> --- trunk/opal/mca/event/libevent207/libevent207.h (original)
>> +++ trunk/opal/mca/event/libevent207/libevent207.h 2010-11-05 14:54:19 EDT (Fri, 05 Nov 2010)
>> @@ -42,9 +42,6 @@
>> #include<string.h>
>> #include<assert.h>
>> #include<time.h>
>> -#ifndef WIN32
>> -#include<stdbool.h>
>> -#endif
>>
>> #include "opal/class/opal_object.h"
>> #include "opal/threads/mutex.h"
>> _______________________________________________
>> svn-full mailing list
>> svn-full_at_[hidden]
>> http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
>

-- 
Oracle
Terry D. Dontje | Principal Software Engineer
Developer Tools Engineering | +1.781.442.2631
Oracle *- Performance Technologies*
95 Network Drive, Burlington, MA 01803
Email terry.dontje_at_[hidden] <mailto:terry.dontje_at_[hidden]>



picture