Re: [classad-users] classads and gcc-4.x...

[Jan Pospisil <honik@xxxxxxxxxx>]

On Wed, 8 Nov 2006, Alain Roy wrote:

> No. We haven't tried to build against gcc 4.1.x yet, so we do not
> have a fix for this problem. If you have any suggested patches, we'll
> take them... :)
o.k. in the attachment there is a small workaround patch. I checked the code and 
it is not a very clean CPP, is it? There are still some warnings from gcc, so to 
make the code at least a little bit clearer, you should check them.
I also changed the Makefile a little. First the header files installed with 
wrong permissions, so I corrected that. Second I added new label test for tests. 
The test programs are nice, however you should add at least some basic 
description to them. Moreover, in the README you suggest to use the 
./test_classads tests.txt, however there is no such program.
Regards
Jan

----------------------------------------------------------------------
  Ing. Jan Pospisil, Ph.D.           e-mail: Jan.Pospisil@xxxxxxxxxx
  University of West Bohemia         phone:  (+420) 37763-2675
  Department of Mathematics          fax:    (+420) 37763-2602
  Plzen, Czech Republic              address: Univerzitni 22, 306 14
----------------------------------------------------------------------

--- ../classads-0.9.8.orig/classad_stl.h	2006-06-14 21:39:30.000000000 +0200
+++ classad_stl.h	2006-11-09 10:59:25.000000000 +0100
@@ -48,7 +48,7 @@
   #define classad_hash_map std::hash_map 
   #define classad_slist    std::slist
 #elif defined(__GNUC__)
-  #if (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+  #if ((__GNUC__ == 3 && __GNUC_MINOR__ > 0) || (__GNUC__ > 3))
     #define classad_hash_map __gnu_cxx::hash_map 
     #define classad_slist    __gnu_cxx::slist
   #else
--- ../classads-0.9.8.orig/Makefile	2006-06-14 21:39:30.000000000 +0200
+++ Makefile	2006-11-10 08:19:13.000000000 +0100
@@ -76,15 +76,17 @@
 shared: shared.C
 	$(CPlusPlus) -fPIC -shared -o libshared.so shared.C
 
+test: classad_version classad_unit_tester classad_functional_tester test_xml extra_tests 
+	./classad_version
+	./classad_unit_tester -all
+	./test_xml
+	./extra_tests
+
 install:: $(LIB_NAME) classad_functional_tester classad_unit_tester classad_version
-	mkdir -p $(LIB_INSTALL)
-	mkdir -p $(BIN_INSTALL)
-	mkdir -p $(INCLUDE_INSTALL)
-	cp $(LIB_NAME)  $(LIB_INSTALL)
-	cp classad_functional_tester $(BIN_INSTALL)
-	cp classad_unit_tester $(BIN_INSTALL)
-	cp classad_version $(BIN_INSTALL)
-	cp $(HEADER_FILES) $(INCLUDE_INSTALL)
+	mkdir -p $(LIB_INSTALL) $(BIN_INSTALL) $(INCLUDE_INSTALL)
+	install -m 644 $(LIB_NAME) $(LIB_INSTALL)
+	install -m 755 classad_functional_tester classad_unit_tester classad_version $(BIN_INSTALL)
+	install -m 644 $(HEADER_FILES) $(INCLUDE_INSTALL)
 
 clean: tidy
 	rm -f classad_functional_tester classad_unit_tester classad_version