[MOAB-dev] r5033 - in MOAB/trunk/src: . io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-06-23 10:57:16 -0500 (Thu, 23 Jun 2011)
New Revision: 5033

Removed:
   MOAB/trunk/src/moab_mpe.c
Modified:
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/io/ReadHDF5Dataset.cpp
   MOAB/trunk/src/moab_mpe.h
Log:
Remove MOAB's MPE_Allocate_event: MPE already provides MPE_Log_get_event_nubmer to do the same thing

Modified: MOAB/trunk/src/Makefile.am
===================================================================
--- MOAB/trunk/src/Makefile.am	2011-06-21 21:12:14 UTC (rev 5032)
+++ MOAB/trunk/src/Makefile.am	2011-06-23 15:57:16 UTC (rev 5033)
@@ -131,8 +131,7 @@
   VertexSequence.cpp \
   WriteUtil.cpp \
   WriteUtil.hpp \
-  moab_mpe.h \
-  moab_mpe.c
+  moab_mpe.h
 
 # The list of header files which are to be installed
 nobase_libMOAB_la_include_HEADERS = \

Modified: MOAB/trunk/src/io/ReadHDF5Dataset.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5Dataset.cpp	2011-06-21 21:12:14 UTC (rev 5032)
+++ MOAB/trunk/src/io/ReadHDF5Dataset.cpp	2011-06-23 15:57:16 UTC (rev 5033)
@@ -38,8 +38,8 @@
 static std::pair<int,int> allocate_mpe_state( const char* name, const char* color )
 {
   std::pair<int,int> result;
-  result.first = MPE_Allocate_event();
-  result.second = MPE_Allocate_event();
+  result.first = MPE_Log_get_event_number();
+  result.second = MPE_Log_get_event_number();
   MPE_Describe_state( result.first, result.second, name, color );
   return result;
 }

Deleted: MOAB/trunk/src/moab_mpe.c
===================================================================
--- MOAB/trunk/src/moab_mpe.c	2011-06-21 21:12:14 UTC (rev 5032)
+++ MOAB/trunk/src/moab_mpe.c	2011-06-23 15:57:16 UTC (rev 5033)
@@ -1,7 +0,0 @@
-#include "moab_mpe.h"
-
-int MPE_Allocate_event()
-{
-  static int counter = MOAB_MPE_FIRST_EVENT;
-  return counter++;
-}

Modified: MOAB/trunk/src/moab_mpe.h
===================================================================
--- MOAB/trunk/src/moab_mpe.h	2011-06-21 21:12:14 UTC (rev 5032)
+++ MOAB/trunk/src/moab_mpe.h	2011-06-23 15:57:16 UTC (rev 5033)
@@ -1,17 +1,5 @@
 #ifndef MOAB_MPE_H
-#define MOAB_MPE_H