Changeset 8752

Timestamp:

Mar 12, 2013, 11:36:44 AM (12 years ago)

Author:

wilsonp

Message:

Small changes to reduce compiler warnings

Location:

trunk/anuga_core/source/anuga

Files:

• fit_interpolate/fitsmooth.c (modified) (1 diff)
• fit_interpolate/p_test.c (modified) (1 diff)
• utilities/compile.py (modified) (4 diffs)
• utilities/quad_tree.h (modified) (1 diff)
• utilities/quad_tree_ext.c (modified) (1 diff)
• utilities/sparse_matrix_ext.c (modified) (1 diff)

trunk/anuga_core/source/anuga/fit_interpolate/fitsmooth.c

@@ -879 +879 @@
     #else
     quad_tree * quadtree = (quad_tree*) PyCObject_AsVoidPtr(tree);
-    #endif;
+    #endif
     
     // Return the number of elements in the tree (stored in struct)

trunk/anuga_core/source/anuga/fit_interpolate/p_test.c

@@ -36 +36 @@
 /* ===========  that's all the easy stuff than can be changed  ============ */
 
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -43 +43 @@
 separation_line = '---------------------------------------'      
  
-def compile(FNs=None, CC=None, LD = None, SFLAG = None, verbose = 1):
+def compile(FNs=None, CC=None, LD = None, SFLAG = None, verbose = 0, all_warnings = False):
   """compile(FNs=None, CC=None, LD = None, SFLAG = None):
   
@@ -183 +183 @@
 
   # Verify that compiler can be executed
-  print 'Compiler: %s, version ' %compiler,
-  sys.stdout.flush()
-  s = '%s -dumpversion' %(compiler)
-  err = os.system(s)
-  print
+  if verbose:
+    print 'Compiler: %s, version ' %compiler,
+    sys.stdout.flush()
+    s = '%s -dumpversion' %(compiler)
+    err = os.system(s)
+    print
+  else:
+    s = '%s -dumpversion > /dev/null' %(compiler)
+    err = os.system(s)
   
   if err != 0:
@@ -276 +280 @@
     # -O3 -g
     if utilities_include_dir is None:    
-      s = '%s -c %s -I"%s" -o "%s.o" -Wall -O3'\
+      s = '%s -c %s -I"%s" -o "%s.o" -O3'\
           %(compiler, FN, python_include, root)
     else:
@@ -284 +288 @@
       elif FN == "polygon_ext.c":
         # gcc 4.3.x is problematic with this file if '-O3' is used
-        s = '%s -c %s %s -I"%s" -I"%s" -o "%s.o" -Wall'\
+        s = '%s -c %s %s -I"%s" -I"%s" -o "%s.o"'\
             %(compiler, FN, I_dirs, python_include, utilities_include_dir, root)
       else:
-        s = '%s -c %s %s -I"%s" -I"%s" -o "%s.o" -Wall -O3'\
+        s = '%s -c %s %s -I"%s" -I"%s" -o "%s.o" -O3'\
             %(compiler, FN, I_dirs, python_include, utilities_include_dir, root)
+
+    if all_warnings:
+      s += ' -Wall'
 
     if os.name == 'posix' and os.uname()[4] in ['x86_64', 'ia64']:

trunk/anuga_core/source/anuga/utilities/quad_tree.h

@@ -11 +11 @@
 #include <stdlib.h>  /* atoi, malloc */
 #include <string.h>  /* strcpy */
+#include <math.h>
 
 #ifndef quad_tree_H

trunk/anuga_core/source/anuga/utilities/quad_tree_ext.c

@@ -11 +11 @@
 #include "quad_tree.h"
 
+// PYVERSION273 used to check python version for use of PyCapsule
+#if PY_MAJOR_VERSION>=2 && PY_MINOR_VERSION>=7 && PY_MICRO_VERSION>=3
+    #define PYVERSION273
+#endif
 
 

trunk/anuga_core/source/anuga/utilities/sparse_matrix_ext.c

@@ -78 +78 @@
 
         val = PyFloat_AS_DOUBLE(py_val);
-        printf("val: %d\n",val);
+        printf("val: %f\n",val);
 
         i = (int) PyInt_AS_LONG(PyTuple_GET_ITEM(py_key,0));