Changeset 3272 for MOAB

Show
Ignore:
Timestamp:
11/03/09 12:44:52 (4 months ago)
Author:
kraftche
Message:

include MBmpi.h in any C++ code that includes an HDF5 header because otherwise mpi.h might get pulled in indirectly by the HDF5 headers w/out our work-arounds for the SEEK_SET conflicts

Location:
MOAB/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • MOAB/trunk/MBAdaptiveKDTree.cpp

    r3241 r3272  
    5555 
    5656#if defined(MB_AD_KD_TREE_USE_SINGLE_TAG) && defined(HDF5_FILE) 
     57  /* include our MPI header before any HDF5 because otherwise 
     58     it will get included indirectly by HDF5 */ 
     59# ifdef USE_MPI 
     60#  include "MBmpi.h" 
     61# endif  
    5762# include <H5Tpublic.h> 
    5863#endif 

  • MOAB/trunk/ReadHDF5.cpp

    r3188 r3272  
    2525 
    2626#include <assert.h> 
     27/* include our MPI header before any HDF5 because otherwise 
     28   it will get included indirectly by HDF5 */ 
     29#ifdef USE_MPI 
     30#  include "MBmpi.h" 
     31#endif  
    2732#include <H5Tpublic.h> 
    2833#include <H5Ppublic.h> 

  • MOAB/trunk/WriteHDF5.cpp

    r3099 r3272  
    4242#include <cstdio> 
    4343#include <iostream> 
     44/* include our MPI header before any HDF5 because otherwise 
     45   it will get included indirectly by HDF5 */ 
     46#ifdef USE_MPI 
     47#  include "MBmpi.h" 
     48#endif  
    4449#include <H5Tpublic.h> 
    4550#include <H5Ppublic.h>