Changeset 2ab9c432 in sasview for src/sas

Timestamp:

Feb 2, 2017 5:00:36 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2510b9b, e92a352

Parents:

c6f3aec

Message:

remove compiler warnings about uninitialized constants: if they are unitialized don't declare them as const; leave in warning about deprecated numpy api until after release

File:

• src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) (2 diffs)

src/sas/sascalc/file_converter/c_ext/bsl_loader.c

@@ -1 +1 @@
 #include <Python.h>
+//#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
 #include <stdio.h>
@@ -21 +22 @@
 static PyObject *CLoader_init(CLoader *self, PyObject *args, PyObject *kwds) {
     const char *filename;
-    const int n_frames;
-    const int n_pixels;
-    const int n_rasters;
-    const int swap_bytes;
+    int n_frames;
+    int n_pixels;
+    int n_rasters;
+    int swap_bytes;
 
     if (self != NULL) {