[MOAB-dev] r5353 - MOAB/trunk/src/parallel

[jvporter at wisc.edu]

Author: jvporter
Date: 2012-01-26 15:22:48 -0600 (Thu, 26 Jan 2012)
New Revision: 5353

Added:
   MOAB/trunk/src/parallel/sort_imp.h
Removed:
   MOAB/trunk/src/parallel/sort_imp.c
Modified:
   MOAB/trunk/src/parallel/Makefile.am
   MOAB/trunk/src/parallel/sort.c
Log:
Fix build issue with sort_imp.c (autotools treated it as a regular source file rather than an X macro file)


Modified: MOAB/trunk/src/parallel/Makefile.am
===================================================================
--- MOAB/trunk/src/parallel/Makefile.am	2012-01-26 21:20:31 UTC (rev 5352)
+++ MOAB/trunk/src/parallel/Makefile.am	2012-01-26 21:22:48 UTC (rev 5353)
@@ -37,7 +37,7 @@
      crystal.h \
      crystal.c errmem.c \
      transfer.c gs.c gs.h tuple_list.c \
-     sort.c transfer.h sort_imp.c
+     sort.c transfer.h sort_imp.h
 
 # The list of header files which are to be installed
   MOAB_PARALLEL_HDRS += \

Modified: MOAB/trunk/src/parallel/sort.c
===================================================================
--- MOAB/trunk/src/parallel/sort.c	2012-01-26 21:20:31 UTC (rev 5352)
+++ MOAB/trunk/src/parallel/sort.c	2012-01-26 21:22:48 UTC (rev 5353)
@@ -9,7 +9,7 @@
 #define Value uint
 #define Data sort_data
 typedef struct { Value v; Index i; } Data;
-#include "sort_imp.c"
+#include "sort_imp.h"
 
 #undef Value
 #undef Data
@@ -33,6 +33,6 @@
 #  define merge_index_sort    merge_index_sort_long
 #  define sort                sort_long
 #  define index_sort          index_sort_long
-#  include "sort_imp.c"
+#  include "sort_imp.h"
 #endif
 

Deleted: MOAB/trunk/src/parallel/sort_imp.c
===================================================================
--- MOAB/trunk/src/parallel/sort_imp.c	2012-01-26 21:20:31 UTC (rev 5352)
+++ MOAB/trunk/src/parallel/sort_imp.c	2012-01-26 21:22:48 UTC (rev 5353)
@@ -1,350 +0,0 @@
-
-/* this file possibly included multiple times by sort.c
-   for sorting different integer sizes;
-   
-   look in sort.c for some controlling macro definitions,
-   like Value, Index, Data, and function names */
-
-#ifdef Value
-
-/*------------------------------------------------------------------------------