From b3f2ac8d46288f96b269afbc6c1d75517447ca43 Mon Sep 17 00:00:00 2001
From: Terry Dontje <terry.dontje@oracle.com>
Date: Wed, 27 Oct 2010 20:47:42 +0000
Subject: [PATCH] removed direct include of stdbool.h from event.h that was
 causing studio C++ issues.  Also removed include of stdbool.h in a couple
 other places since it was already being pulled in via opal_config_bottom.h.

This commit was SVN r23963.
---
 opal/mca/event/event.h | 6 +-----
 opal/threads/mutex.h   | 9 +--------
 opal/util/output.h     | 9 +--------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/opal/mca/event/event.h b/opal/mca/event/event.h
index bc7ed03e50..c41f267615 100644
--- a/opal/mca/event/event.h
+++ b/opal/mca/event/event.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  *
  * The OPAL interface into the Libevent library. Contains a number
  * of renamings for use inside OPAL, and some customized wrapper functions
@@ -26,9 +27,6 @@
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #endif
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif
 
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
@@ -73,9 +71,7 @@ typedef struct {
 OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_event_base_t);
 
 #define OPAL_TIMEOUT_DEFAULT	{1, 0}
-
 typedef void (*opal_event_callback_fn_t)(int, short, void *);
-
 typedef int (*opal_event_base_module_init_fn_t)(void);
 typedef int (*opal_event_base_module_fini_fn_t)(void);
 typedef void (*opal_event_base_module_set_debug_output_fn_t)(bool output);
diff --git a/opal/threads/mutex.h b/opal/threads/mutex.h
index 4d56ee1446..3a08811a39 100644
--- a/opal/threads/mutex.h
+++ b/opal/threads/mutex.h
@@ -13,6 +13,7 @@
  * Copyright (c) 2007      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2007      Voltaire. All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  *
  * $COPYRIGHT$
  * 
@@ -26,14 +27,6 @@
 
 #include "opal_config.h"
 
-/*
- * Circumentvent problems in C++ compilers.
- * For C++, we should not need the file, anyhow.
- */
-#if defined(HAVE_STDBOOL_H) && !(defined(c_plusplus) || defined(__cplusplus))
-#include <stdbool.h>
-#endif
-
 #if OPAL_HAVE_THREAD_SUPPORT
 #include "opal/sys/atomic.h"
 #endif  /* OPAL_HAVE_THREAD_SUPPORT */
diff --git a/opal/util/output.h b/opal/util/output.h
index 39b348bb43..873e3a8fe7 100644
--- a/opal/util/output.h
+++ b/opal/util/output.h
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2007-2008 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -68,14 +69,6 @@
 #include <stdarg.h>
 #endif
 
-/*
- * For C++, we should not need the file, anyhow.
- * Circumentvent problems in C++ compilers.
- */
-#if defined(HAVE_STDBOOL_H) && !(defined(c_plusplus) || defined(__cplusplus))
-#include <stdbool.h>
-#endif
-
 #include "opal/class/opal_object.h"
 
 BEGIN_C_DECLS