- Add $HEADER$

- Fix up include filenames

This commit was SVN r40.

src/lam/lfc/array.c

@@ -1,4 +1,6 @@
 /*
+ * $HEADER$
+ *
  * Copyright 2002-2003. The Regents of the University of California. This material
  * was produced under U.S. Government contract W-7405-ENG-36 for Los Alamos
  * National Laboratory, which is operated by the University of California for
@@ -27,8 +29,9 @@
  * GNU Lesser General Public License for more details.
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
 #include <string.h>
-#include "lam/base/array.h"
+#include "lam/lfc/array.h"
 
 lam_class_info_t array_cls = {"lam_array_t", &object_cls, 
     (class_init_t) lam_arr_init, (class_destroy_t)lam_arr_destroy};

src/lam/lfc/array.h

@@ -1,4 +1,6 @@
 /*
+ * $HEADER$
+ *
  * Copyright 2002-2003. The Regents of the University of California. This material
  * was produced under U.S. Government contract W-7405-ENG-36 for Los Alamos
  * National Laboratory, which is operated by the University of California for
@@ -28,11 +30,11 @@
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef ARRAY_H
-#define ARRAY_H
+#ifndef LAM_ARRAY_H
+#define LAM_ARRAY_H
 
-#include "lam_types.h"
-#include "lam/base/object.h"
+#include "include/lam_types.h"
+#include "lam/lfc/object.h"
 
 typedef struct lam_array
 {
@@ -64,6 +66,6 @@ void lam_arr_remove_item(lam_array_t *arr, int index);
 void lam_arr_set_item(lam_array_t *arr, lam_object_t *item, int index);
 
 
-#endif  /* ARRAY_H */
+#endif  /* LAM_ARRAY_H */
 
 

src/lam/lfc/hash_table.c

@@ -1,4 +1,6 @@
 /*
+ * $HEADER$
+ *
  * Copyright 2002-2003. The Regents of the University of California. This material
  * was produced under U.S. Government contract W-7405-ENG-36 for Los Alamos
  * National Laboratory, which is operated by the University of California for
@@ -27,12 +29,13 @@
  * GNU Lesser General Public License for more details.
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+
 #include <string.h>
 #include <stdlib.h>
 
-#include "lam_config.h"
-#include "lam_constants.h"
-#include "lam/base/hash_table.h"
+#include "include/lam_config.h"
+#include "include/lam_constants.h"
+#include "lam/lfc/hash_table.h"
 
 #define     BUCKET_ALLOC_SZ         5
 

src/lam/lfc/hash_table.h

@@ -27,11 +27,12 @@
  * GNU Lesser General Public License for more details.
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#ifndef HASH_TABLE_H
-#define HASH_TABLE_H
 
-#include "lam_stdint.h"
-#include "lam/base/object.h"
+#ifndef LAM_HASH_TABLE_H
+#define LAM_HASH_TABLE_H
+
+#include "include/lam_stdint.h"
+#include "lam/lfc/object.h"
 
 typedef struct lam_fhnode
 {
@@ -80,5 +81,4 @@ int   lam_fh_set_value_for_skey(lam_fast_hash_t *htbl, void *val, const char *ke
 /* returns the number of items in the table */
 static inline uint32_t lam_fh_count(lam_fast_hash_t *htbl) {return htbl->fh_count;}
 
-#endif  /* HASH_TABLE_H */
-
+#endif  /* LAM_HASH_TABLE_H */

src/lam/lfc/list.c

@@ -1,4 +1,6 @@
 /*
+ * $HEADER$
+ *
  * Copyright 2002-2003. The Regents of the University of California. This material
  * was produced under U.S. Government contract W-7405-ENG-36 for Los Alamos
  * National Laboratory, which is operated by the University of California for
@@ -27,7 +29,8 @@
  * GNU Lesser General Public License for more details.
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#include "lam/base/list.h"
+
+#include "lam/lfc/list.h"
 
 
 /*

src/lam/lfc/list.h

@@ -28,10 +28,10 @@
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifndef _LIST_H_
-#define _LIST_H_
+#ifndef LAM_LIST_H
+#define LAM_LIST_H
 
-#include "lam/base/object.h"
+#include "lam/lfc/object.h"
 
 /*
  *
@@ -160,5 +160,4 @@ lam_dbl_item_t *lam_dbl_remove_first(lam_dbl_list_t *list);
  */
 lam_dbl_item_t *lam_dbl_remove_last(lam_dbl_list_t *list);
 
-#endif  
-
+#endif /* LAM_LIST_H */

src/lam/lfc/object.c

@@ -1,4 +1,6 @@
 /*
+ * $HEADER$
+ *
  * Copyright 2002-2003. The Regents of the University of California. This material
  * was produced under U.S. Government contract W-7405-ENG-36 for Los Alamos
  * National Laboratory, which is operated by the University of California for
@@ -27,7 +29,8 @@
  * GNU Lesser General Public License for more details.
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#include "lam/base/object.h"
+
+#include "lam/lfc/object.h"
 
 lam_class_info_t object_cls = { "lam_object_t", 0, lam_obj_init, lam_obj_destroy };
 

src/lam/lfc/object.h

@@ -27,11 +27,12 @@
  * GNU Lesser General Public License for more details.
  */
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#ifndef _OBJECT_H_
-#define _OBJECT_H_
+
+#ifndef LAM_OBJECT_H
+#define LAM_OBJECT_H
 
 #include <stdlib.h>
-#include "lam_types.h"
+#include "include/lam_types.h"
 #include "lam/os/atomic.h"
 
 /*
@@ -131,5 +132,5 @@ static inline void lam_obj_release(lam_object_t *obj)
     }
 }
 
-#endif
+#endif /* LAM_OBJECT_H */