Fixed quite a few include guard mishaps.

darcs-hash:20020901125223-07bb3-f494618480c1ffc46118365c4c957d7a313d7be9.gz

2 files changed, 9 insertions, 10 deletions

diff --git a/Carpet/CarpetReduce/src/reduce.h b/Carpet/CarpetReduce/src/reduce.h
index 9580fbfa1..b9863d417 100644
--- a/Carpet/CarpetReduce/src/reduce.h
+++ b/Carpet/CarpetReduce/src/reduce.h
@@ -1,16 +1,19 @@
-/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.h,v 1.1 2001/12/11 13:08:58 schnetter Exp $ */
+/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.h,v 1.2 2002/09/01 14:52:27 schnetter Exp $ */
 
 #ifndef CARPETREDUCE_H
 #define CARPETREDUCE_H
 
 #ifdef __cplusplus
-extern "C" {
+namespace CarpetReduce {
+  extern "C" {
 #endif
   
-  int CarpetReduceStartup (void);
-  
+    /* Scheduled functions */
+    int CarpetReduceStartup (void);
+    
 #ifdef __cplusplus
-} /* extern "C" */
+  } /* extern "C" */
+} /* namespace CarpetReduce */
 #endif
 
 #endif /* !defined(CARPETREDUCE_H) */
diff --git a/Carpet/CarpetReduce/src/reduce.hh b/Carpet/CarpetReduce/src/reduce.hh
index b3bcd28ae..856f2f823 100644
--- a/Carpet/CarpetReduce/src/reduce.hh
+++ b/Carpet/CarpetReduce/src/reduce.hh
@@ -1,12 +1,8 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.hh,v 1.3 2002/09/01 14:37:59 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.hh,v 1.4 2002/09/01 14:52:28 schnetter Exp $
 
 #ifndef CARPETREDUCE_HH
 #define CARPETREDUCE_HH
 
-namespace CarpetReduce {
-  
 #include "reduce.h"
-  
-} // namespace CarpetReduce
 
 #endif // !defined(CARPETREDUCE_HH)