[MOAB-dev] r3608 - in MOAB/trunk: src/oldinc test/oldinc

kraftche at cae.wisc.edu kraftche at cae.wisc.edu
Fri Mar 12 19:20:43 CST 2010


Author: kraftche
Date: 2010-03-12 19:20:43 -0600 (Fri, 12 Mar 2010)
New Revision: 3608

Added:
   MOAB/trunk/src/oldinc/MBBSPTreePoly.hpp
   MOAB/trunk/src/oldinc/MBCartVect.hpp
Modified:
   MOAB/trunk/src/oldinc/MBAdaptiveKDTree.hpp
   MOAB/trunk/src/oldinc/MBBSPTree.hpp
   MOAB/trunk/src/oldinc/MBCore.hpp
   MOAB/trunk/src/oldinc/MBGeomUtil.hpp
   MOAB/trunk/src/oldinc/MBInterface.hpp
   MOAB/trunk/src/oldinc/MBOrientedBoxTreeTool.hpp
   MOAB/trunk/src/oldinc/MBParallelComm.hpp
   MOAB/trunk/src/oldinc/MBParallelData.hpp
   MOAB/trunk/src/oldinc/MBProcConfig.hpp
   MOAB/trunk/src/oldinc/MBRange.hpp
   MOAB/trunk/src/oldinc/MBReadUtilIface.hpp
   MOAB/trunk/src/oldinc/MBReaderIface.hpp
   MOAB/trunk/src/oldinc/MBReaderWriterSet.hpp
   MOAB/trunk/src/oldinc/MBSkinner.hpp
   MOAB/trunk/src/oldinc/MBUtil.hpp
   MOAB/trunk/src/oldinc/MBWriteUtilIface.hpp
   MOAB/trunk/src/oldinc/MBWriterIface.hpp
   MOAB/trunk/src/oldinc/Makefile.am
   MOAB/trunk/test/oldinc/test_oldinc.cpp
Log:
o add a few missing compat headers
o add includes to some compat headers so they still pull in the same stuff


Modified: MOAB/trunk/src/oldinc/MBAdaptiveKDTree.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBAdaptiveKDTree.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBAdaptiveKDTree.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBAdaptiveKDTree_HEADER
 #define MBAdaptiveKDTree_HEADER
+
+#include "MBTypes.h"
+
 #include "moab/AdaptiveKDTree.hpp"
 typedef moab::AdaptiveKDTree MBAdaptiveKDTree;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBBSPTree.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBBSPTree.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBBSPTree.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,10 @@
 #ifndef MBBSPTree_HEADER
 #define MBBSPTree_HEADER
+
+#include "MBInterface.hpp"
+#include "MBTypes.h"
+
 #include "moab/BSPTree.hpp"
 typedef moab::BSPTree MBBSPTree;
+
 #endif

Added: MOAB/trunk/src/oldinc/MBBSPTreePoly.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBBSPTreePoly.hpp	                        (rev 0)
+++ MOAB/trunk/src/oldinc/MBBSPTreePoly.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -0,0 +1,9 @@
+#ifndef MBBSPTreePoly_HEADER
+#define MBBSPTreePoly_HEADER
+
+#include "MBTypes.h"
+
+#include "moab/BSPTreePoly.hpp"
+typedef moab::BSPTreePoly MBBSPTreePoly;
+
+#endif

Added: MOAB/trunk/src/oldinc/MBCartVect.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBCartVect.hpp	                        (rev 0)
+++ MOAB/trunk/src/oldinc/MBCartVect.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -0,0 +1,7 @@
+#ifndef MBCartVect_HEADER
+#define MBCartVect_HEADER
+
+#include "moab/CartVect.hpp"
+typedef moab::CartVect MBCartVect;
+
+#endif

Modified: MOAB/trunk/src/oldinc/MBCore.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBCore.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBCore.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,10 @@
 #ifndef MBCore_HEADER
 #define MBCore_HEADER
+
+#include "MBInterface.hpp"
+#include "MBReaderIface.hpp"
+
 #include "moab/Core.hpp"
 typedef moab::Core MBCore;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBGeomUtil.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBGeomUtil.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBGeomUtil.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBGeomUtil_HEADER
 #define MBGeomUtil_HEADER
+
+#include "MBCartVect.hpp"
+
 #include "moab/GeomUtil.hpp"
 namespace MBGeomUtil = moab::GeomUtil;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBInterface.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBInterface.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBInterface.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBInterface_HEADER
 #define MBInterface_HEADER
+
+#include "MBForward.hpp"
+
 #include "moab/Interface.hpp"
 typedef moab::Interface MBInterface;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBOrientedBoxTreeTool.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBOrientedBoxTreeTool.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBOrientedBoxTreeTool.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBOrientedBoxTreeTool_HEADER
 #define MBOrientedBoxTreeTool_HEADER
+
+#include "MBForward.hpp"
+
 #include "moab/OrientedBoxTreeTool.hpp"
 typedef moab::OrientedBoxTreeTool MBOrientedBoxTreeTool;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBParallelComm.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBParallelComm.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBParallelComm.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,11 @@
 #ifndef MBParallelComm_HEADER
 #define MBParallelComm_HEADER
+
+#include "MBInterface.hpp"
+#include "MBRange.hpp"
+#include "MBProcConfig.hpp"
+
 #include "moab/ParallelComm.hpp"
 typedef moab::ParallelComm MBParallelComm;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBParallelData.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBParallelData.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBParallelData.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,10 @@
 #ifndef MBParallelData_HEADER
 #define MBParallelData_HEADER
+
+#include "MBFoward.hpp"
+#include "MBRange.hpp"
+
 #include "moab/ParallelData.hpp"
 typedef moab::ParallelData MBParallelData;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBProcConfig.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBProcConfig.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBProcConfig.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,13 @@
 #ifndef MBProcConfig_HEADER
 #define MBProcConfig_HEADER
+
+#include "MBTypes.h"
+#include "MBRange.hpp"
+#ifdef USE_MPI
+#  include "MBmpi.h"
+#endif
+
 #include "moab/ProcConfig.hpp"
 typedef moab::ProcConfig MBProcConfig;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBRange.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBRange.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBRange.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,6 +1,8 @@
 #ifndef MBRange_HEADER
 #define MBRange_HEADER
 
+#include "MBTypes.h"
+
 #include "moab/Range.hpp"
 
 typedef moab::Range MBRange;

Modified: MOAB/trunk/src/oldinc/MBReadUtilIface.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBReadUtilIface.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBReadUtilIface.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBReadUtilIface_HEADER
 #define MBReadUtilIface_HEADER
+
+#include "MBTypes.h"
+
 #include "moab/ReadUtilIface.hpp"
 typedef moab::ReadUtilIface MBReadUtilIface;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBReaderIface.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBReaderIface.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBReaderIface.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBReaderIface_HEADER
 #define MBReaderIface_HEADER
+
+#include "MBTypes.h"
+
 #include "moab/ReaderIface.hpp"
 typedef moab::ReaderIface MBReaderIface;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBReaderWriterSet.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBReaderWriterSet.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBReaderWriterSet.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBReaderWriterSet_HEADER
 #define MBReaderWriterSet_HEADER
+
+#include "MBTypes.h"
+
 #include "moab/ReaderWriterSet.hpp"
 typedef moab::ReaderWriterSet MBReaderWriterSet;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBSkinner.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBSkinner.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBSkinner.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBSkinner_HEADER
 #define MBSkinner_HEADER
+
+#include "MBForward.hpp"
+
 #include "moab/Skinner.hpp"
 typedef moab::Skinner MBSkinner;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBUtil.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBUtil.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBUtil.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,6 +1,10 @@
 #ifndef MBUtil_HEADER
 #define MBUtil_HEADER
+
+#include "MBForward.hpp"
+
 #include "moab/Util.hpp"
 typedef moab::Coord MBCoord;
 typedef moab::Util  MBUtil;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBWriteUtilIface.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBWriteUtilIface.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBWriteUtilIface.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBWriteUtilIface_HEADER
 #define MBWriteUtilIface_HEADER
+
+#include "MBRange.hpp"
+
 #include "moab/WriteUtilIface.hpp"
 typedef moab::WriteUtilIface MBWriteUtilIface;
+
 #endif

Modified: MOAB/trunk/src/oldinc/MBWriterIface.hpp
===================================================================
--- MOAB/trunk/src/oldinc/MBWriterIface.hpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/MBWriterIface.hpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,5 +1,9 @@
 #ifndef MBWriterIface_HEADER
 #define MBWriterIface_HEADER
+
+#include "MBTypes.h"
+
 #include "moab/WriterIface.hpp"
 typedef moab::WriterIface MBWriterIface;
+
 #endif

Modified: MOAB/trunk/src/oldinc/Makefile.am
===================================================================
--- MOAB/trunk/src/oldinc/Makefile.am	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/src/oldinc/Makefile.am	2010-03-13 01:20:43 UTC (rev 3608)
@@ -1,6 +1,8 @@
 
 include_HEADERS = MBAdaptiveKDTree.hpp \
                   MBBSPTree.hpp \
+                  MBBSPTreePoly.hpp \
+                  MBCartVect.hpp \
                   MBCore.hpp \
                   MBEntityHandle.h \
                   MBForward.hpp \

Modified: MOAB/trunk/test/oldinc/test_oldinc.cpp
===================================================================
--- MOAB/trunk/test/oldinc/test_oldinc.cpp	2010-03-12 22:59:46 UTC (rev 3607)
+++ MOAB/trunk/test/oldinc/test_oldinc.cpp	2010-03-13 01:20:43 UTC (rev 3608)
@@ -60,6 +60,9 @@
 #include "MBOrientedBoxTreeTool.hpp"
 #include "MBSkinner.hpp"
 
+#include "MBCartVect.hpp"
+#include "MBBSPTreePoly.hpp"
+
 int main()
 {
     // check that the expected types are defined
@@ -82,6 +85,9 @@
   MBProcConfig* pconf_ptr;
 #endif
 
+  MBCartVect vect(0.0);
+  MBBSPTreePoly poly;
+
   return 0;
 }
 



More information about the moab-dev mailing list