more compiler-found changes --> !!!first clean compile!!!

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@461 f88db872-0e4f-0410-b76b-b9085cfa78c5

5 files changed, 18 insertions, 20 deletions

diff --git a/src/jtutil/array.cc b/src/jtutil/array.cc
index cc6e565..3590d16 100644
--- a/src/jtutil/array.cc
+++ b/src/jtutil/array.cc
@@ -308,7 +308,10 @@ if (we_own_array_)
 
 template class jtutil::array1d<int>;
 
-template class jtutil::array1d<void *>;
+// FIXME: we shouldn't have to instantiate these both, the const one
+//	  derivable from the non-const one. :(
+template class jtutil::array1d<      void *>;
+template class jtutil::array1d<const void *>;
 
 template class jtutil::array1d<float>;
 template class jtutil::array2d<float>;
diff --git a/src/jtutil/make.code.defn b/src/jtutil/make.code.defn
index 94445b3..f075c17 100644
--- a/src/jtutil/make.code.defn
+++ b/src/jtutil/make.code.defn
@@ -2,7 +2,8 @@
 # $Header$
 
 # Source files in this directory
-SRCS = array.cc cpm_map.cc fuzzy.cc linear_map.cc miscfp.cc norm.cc round.cc
+SRCS = array.cc cpm_map.cc fuzzy.cc linear_map.cc miscfp.cc norm.cc round.cc \
+       error_exit.c
 
 # Subdirectories containing source files
 SUBDIRS = 
diff --git a/src/patch/make.code.defn b/src/patch/make.code.defn
index f061fb6..7380ee8 100644
--- a/src/patch/make.code.defn
+++ b/src/patch/make.code.defn
@@ -8,7 +8,8 @@ SRCS = coords.cc \
        patch.cc \
        ghost_zone.cc \
        patch_frontier.cc \
-       patch_system.cc
+       patch_system.cc \
+       test_patch_system.cc
 
 # Subdirectories containing source files
 SUBDIRS = jtutil util
diff --git a/src/patch/patch_system.cc b/src/patch/patch_system.cc
index 32a17fe..9947e43 100644
--- a/src/patch/patch_system.cc
+++ b/src/patch/patch_system.cc
@@ -759,25 +759,15 @@ void patch_system::assert_all_ghost_zones_fully_setup() const
 switch	(type_in)
 	{
 case full_sphere_patch_system:
-	return patch_system_info
-	       ::full_sphere_patch_system_info
-	       ::N_patches;
+	return patch_system_info::full_sphere::N_patches;
 case plus_z_hemisphere_patch_system:
-	return patch_system_info
-	       ::plus_z_hemisphere_patch_system_info
-	       ::N_patches;
+	return patch_system_info::plus_z_hemisphere::N_patches;
 case plus_xy_quadrant_patch_system:
-	return patch_system_info
-	       ::plus_xy_quadrant_patch_system_info
-	       ::N_patches;
+	return patch_system_info::plus_xy_quadrant::N_patches;
 case plus_xz_quadrant_patch_system:
-	return patch_system_info
-	       ::plus_xz_quadrant_patch_system_info
-	       ::N_patches;
-case octant_patch_system:
-	return patch_system_info
-	       ::octant_patch_system_info
-	       ::N_patches;
+	return patch_system_info::plus_xz_quadrant::N_patches;
+case plus_xyz_octant_patch_system:
+	return patch_system_info::plus_xyz_octant::N_patches;
 default:
 	error_exit(PANIC_EXIT,
 "***** patch_system::N_patches_of_type(): bad type=(int)%d!\n"
@@ -817,7 +807,8 @@ default:
 // a patch system's type into.
 //
 //static
-  enum patch_system_type patch_system::type_of_name(const char* name_in)
+  enum patch_system::patch_system_type
+    patch_system::type_of_name(const char* name_in)
 {
 if	(STRING_EQUAL(name_in, "full sphere"))
    then return full_sphere_patch_system;
diff --git a/src/patch/test_patch_system.cc b/src/patch/test_patch_system.cc
index 752fa3e..6fa14c7 100644
--- a/src/patch/test_patch_system.cc
+++ b/src/patch/test_patch_system.cc
@@ -24,6 +24,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include <math.h>
+#include <vector>
+using std::vector;
 
 #include "util_Table.h"
 #include "cctk.h"