Civita now building

Author: highperformancecoder

Makefile

@@ -162,7 +162,7 @@ else
 	cp -f $(EXES)  $(PREFIX)/bin
 endif
 	cp -f fix-privates $(PREFIX)/bin
-	cp -f $(INCLUDES) $(PREFIX)/include
+	cp -f $(INCLUDES) *.cd $(PREFIX)/include
 #	-ln -s $(PREFIX)/include/pack_base.h $(PREFIX)/include/unpack_base.h
 #	cp -r $(SYSINCLUDES) $(PREFIX)
 
@@ -191,7 +191,7 @@ dist:
 	sh makeDist.sh
 
 # cd file generation rules
-$(DESCRIPTORS:%=%-allCDs.h): Makefile
+$(DESCRIPTORS:%=%-allCDs.h): Makefile createCDs.sh
 	createCDs.sh $(subst -allCDs.h,,$@) $(CDHEADERS)
 
 %-dump.cd: %.h

RESTProcess-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_RESTProcess_allCDS_H
+#define CLASSDESC_RESTProcess_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-RESTProcess.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-RESTProcess.cd"
 #endif
+#endif

RESTProcess_base.h

@@ -1600,5 +1600,4 @@ CLASSDESC_USE_OLDSTYLE_MEMBER_OBJECTS(RESTProcess);
 using classdesc::RESTProcess;       
 using classdesc::RESTProcess_onbase;       
 
-#include "RESTProcess_base.cd"
 #endif

createCDs.sh

@@ -1,5 +1,10 @@
 descriptor=$1
 shift
+rm -f $descriptor-allCDs.h
+cat >$descriptor-allCDs.h <<EOF
+#ifndef CLASSDESC_${descriptor}_allCDS_H
+#define CLASSDESC_${descriptor}_allCDS_H
+EOF
 for cdHeader in $*; do
     guard=CLASSDESC_`echo $cdHeader|tr [a-z] [A-Z]`_H 
     cat >>$descriptor-allCDs.h <<EOF
@@ -8,3 +13,4 @@ for cdHeader in $*; do
 #endif
 EOF
 done
+echo "#endif" >>$descriptor-allCDs.h

dump-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_dump_allCDS_H
+#define CLASSDESC_dump_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-dump.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-dump.cd"
 #endif
+#endif

json_pack-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_json_pack_allCDS_H
+#define CLASSDESC_json_pack_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-json_pack.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-json_pack.cd"
 #endif
+#endif

multiArray.h

@@ -152,7 +152,8 @@ namespace classdesc
     bool same(const MultiArray& x) const {return m_data==x.m_data;}
   };
 
-  template <class T, int N> struct is_sequence<MultiArray<T,N>>: public true_type {};
+  template <class T, int N> struct is_sequence<classdesc::MultiArray<T,N>>:
+    public true_type {};
 
   /// friended advance function for use in iterators
   template <class T, int R>

pack-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_pack_allCDS_H
+#define CLASSDESC_pack_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-pack.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-pack.cd"
 #endif
+#endif

random_init-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_random_init_allCDS_H
+#define CLASSDESC_random_init_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-random_init.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-random_init.cd"
 #endif
+#endif

typeName-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_typeName_allCDS_H
+#define CLASSDESC_typeName_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-typeName.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-typeName.cd"
 #endif
+#endif

xml_pack-allCDs.h

@@ -1,3 +1,5 @@
+#ifndef CLASSDESC_xml_pack_allCDS_H
+#define CLASSDESC_xml_pack_allCDS_H
 #ifdef CLASSDESC_MULTIARRAY_H
 #include "multiArray-xml_pack.cd"
 #endif
@@ -19,3 +21,4 @@
 #ifdef CLASSDESC_STRINGKEYMAP_H
 #include "stringKeyMap-xml_pack.cd"
 #endif
+#endif