Changeset 1735

Timestamp:

06/11/11 10:42:45 (7 months ago)

Author:

Freddie Akeroyd

Message:

Remove some warnings and allow passing of globals (e.g. warnings) C/C++ flag in CMake
Refs #286

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• Windows_extra/libNeXus-0-x64.def (modified) (1 diff)
• bindings/cpp/CMakeLists.txt (modified) (2 diffs)
• bindings/cpp/NeXusFile.cpp (modified) (5 diffs)
• bindings/cpp/NeXusFile.hpp (modified) (1 diff)
• include/napi.h (modified) (2 diffs)
• src/CMakeLists.txt (modified) (3 diffs)
• src/napi.c (modified) (8 diffs)
• src/napi4.c (modified) (1 diff)
• src/napi5.c (modified) (4 diffs)
• src/nxstack.c (modified) (3 diffs)
• src/nxxml.c (modified) (1 diff)

trunk/CMakeLists.txt

@@ -134 +134 @@
 
 if (HDF5_FOUND)
-   set (HDF5_CPP "-DHDF5 -DH5_USE_16_API")
+#   set (HDF5_CPP "-DHDF5 -DH5_USE_16_API")
+   set (HDF5_CPP "-DHDF5 -DH5_NO_DEPRECATED_SYMBOLS -DH5Acreate_vers=2 -DH5Aiterate_vers=2 -DH5Dcreate_vers=2 -DH5Dopen_vers=2 -DH5Eclear_vers=2 -DH5Eprint_vers=2 -DH5Epush_vers=2 -DH5Eset_auto_vers=2 -DH5Eget_auto_vers=2 -DH5Ewalk_vers=2 -DH5Gcreate_vers=2 -DH5Gopen_vers=2 -DH5Pget_filter_vers=2 -DH5Pget_filter_by_id_vers=2 -DH5Pinsert_vers=2 -DH5Pregister_vers=2 -DH5Rget_obj_type_vers=2 -DH5Tarray_create_vers=2 -DH5Tcommit_vers=2 -DH5Tget_array_dims_vers=2 -DH5Topen_vers=2")
 endif (HDF5_FOUND)
 
@@ -234 +235 @@
 
 file(WRITE ${CMAKE_SOURCE_DIR}/include/nxconfig.h "/*A dummy config*/")
+
+# warning 4820 is byte padding in structures
+# warning 4996 is about using _strdup ratherthan strdup etc
+# /W4 rather than /Wall
+set(NX_CFLAGS "/W4 /wd4820 /wd4996")
+set(NX_CPP -D_CRT_SECURE_NO_WARNINGS)
 
 # Recurse into the subdirectories.

trunk/Windows_extra/libNeXus-0-x64.def

@@ -76 +76 @@
 putNXDatasetValueAt
 nxigetpath_
+nxilinkexternaldataset_
+nxiisexternaldataset_

trunk/bindings/cpp/CMakeLists.txt

@@ -27 +27 @@
 #====================================================================
 
-add_definitions(-DIN_NEXUS_CPP_LIBRARY=1 )
+add_definitions(-DIN_NEXUS_CPP_LIBRARY=1 ${NX_CPP})
 
 #Make NeXus CPP Bindings Static Library
@@ -33 +33 @@
 set (HEADERS NeXusFile.hpp NeXusException.hpp NeXusStream.hpp)
 set (SOURCES NeXusFile.hpp NeXusFile.cpp NeXusException.hpp NeXusException.cpp NeXusStream.hpp NeXusStream.cpp)
+
+set_property(SOURCE ${SOURCES} APPEND PROPERTY COMPILE_FLAGS ${NX_CFLAGS})
 
 add_library (NeXus_CPP_Static_Library STATIC ${HEADERS} ${SOURCES})

trunk/bindings/cpp/NeXusFile.cpp

@@ -144 +144 @@
 
 static void inner_malloc(void* & data, const std::vector<int64_t>& dims, NXnumtype type) {
-  size_t rank = dims.size();
+  int rank = dims.size();
   int64_t c_dims[NX_MAXRANK];
   for (size_t i = 0; i < rank; i++) {
@@ -363 +363 @@
 template <typename NumT>
 void File::writeData(const string& name, const vector<NumT>& value) {
-  vector<int> dims(1, value.size());
+  vector<int64_t> dims(1, value.size());
   this->writeData(name, value, dims);
 }
@@ -375 +375 @@
 }
 
+template <typename NumT>
+void File::writeData(const string& name, const vector<NumT>& value,
+                     const vector<int64_t>& dims) {
+  this->makeData(name, getType<NumT>(), dims, true);
+  this->putData(value);
+  this->closeData();
+}
 
 
@@ -642 +649 @@
 template <typename NumT>
 void File::putSlab(vector<NumT>& data, int64_t start, int64_t size) {
-  vector<int> start_v;
+  vector<int64_t> start_v;
   start_v.push_back(start);
-  vector<int> size_v;
+  vector<int64_t> size_v;
   size_v.push_back(size);
   this->putSlab(data, start_v, size_v);
@@ -1012 +1019 @@
 
   int rank = start.size();
-  int i_start[NX_MAXRANK];
-  for (int i = 0; i < rank; i++) {
-    i_start[i] = start[i];
-  }
-  int i_size[NX_MAXRANK];
-  for (int i = 0; i < rank; i++) {
-    i_size[i] = size[i];
-  }
-
-  NXstatus status = NXgetslab(this->m_file_id, data, i_start, i_size);
+
+  NXstatus status = NXgetslab64(this->m_file_id, data, &(start[0]), &(size[0]));
   if (status != NX_OK) {
     throw Exception("NXgetslab failed", status);

trunk/bindings/cpp/NeXusFile.hpp

@@ -332 +332 @@
                    const std::vector<int>& dims);
 
+        /**
+     * Create a n-dimension data field, insert the data, and close the data.
+     *
+     * \param name The name of the field to create.
+     * \param value The data to put into the file.
+     * \param dims The dimensions of the data.
+     * \tparam NumT numeric data type of \a value
+     */
+    template <typename NumT>
+    void writeData(const std::string& name, const std::vector<NumT>& value,
+                   const std::vector<int64_t>& dims);
 
     /** Create a 1D data field with an unlimited dimension, insert the data, and close the data.

trunk/include/napi.h

@@ -600 +600 @@
    * @copydoc NXgetslab()
    */
-extern  NXstatus  NXgetslab64(NXhandle handle, void* data, int64_t start[], int64_t size[]);
+extern  NXstatus  NXgetslab64(NXhandle handle, void* data, const int64_t start[], const int64_t size[]);
 
 /**
@@ -907 +907 @@
         NXstatus ( *nxgetinfo64)(NXhandle handle, int* rank, int64_t dimension[], int* datatype);
         NXstatus ( *nxgetnextentry)(NXhandle handle, NXname name, NXname nxclass, int* datatype);
-        NXstatus ( *nxgetslab64)(NXhandle handle, void* data, int64_t start[], int64_t size[]);
+        NXstatus ( *nxgetslab64)(NXhandle handle, void* data, const int64_t start[], const int64_t size[]);
         NXstatus ( *nxgetnextattr)(NXhandle handle, NXname pName, int *iLength, int *iType);
         NXstatus ( *nxgetattr)(NXhandle handle, char* name, void* data, int* iDataLen, int* iType);

trunk/src/CMakeLists.txt

@@ -27 +27 @@
 #====================================================================
 
-add_definitions(-DIN_NEXUS_LIBRARY ${HDF5_DEFINITIONS} ${HDF5_CPP} ${HDF4_CPP} ${MXML_CPP})
+add_definitions(-DIN_NEXUS_LIBRARY ${HDF5_DEFINITIONS} ${HDF5_CPP} ${HDF4_CPP} ${MXML_CPP} ${NX_CPP})
 
 set (NAPISRC napi.c napiu.c nxstack.c nxstack.h stptok.c  nxdataset.c nxdataset.h nx_stptok.h)
@@ -45 +45 @@
 
 set (NAPISRC ${NAPISRC} nxxml.c nxio.c nxio.h)
+
+set_property(SOURCE ${NAPISRC} APPEND PROPERTY COMPILE_FLAGS ${NX_CFLAGS})
 
 file(STRINGS ${PROJECT_SOURCE_DIR}/src/nexus_symbols.txt NEXUS_SYMBOLS)
@@ -66 +68 @@
 #  file(WRITE ${PROJECT_SOURCE_DIR}/src/nexus_symbols.sym ${NEXUS_SYMBOLS})
 #endif (MINGW_MSYS)
-
 
 #Make NeXus Static Library

trunk/src/napi.c

@@ -880 +880 @@
   NXstatus  NXputslab (NXhandle fid, void *data, int iStart[], int iSize[])
   {
-          int i, status, iType, rank;
+          int i, iType, rank;
           int64_t iStart64[NX_MAXRANK], iSize64[NX_MAXRANK];
           if (NXgetinfo64(fid, &rank, iStart64, &iType) != NX_OK)
@@ -961 +961 @@
                                    int dimensions[], int datatype)
   {
-          int i, status;
+          int status;
           int64_t* dims64 = dupDimsArray(dimensions, rank);
           status = NXmalloc64(data, rank, dims64, datatype);
@@ -1041 +1041 @@
 char *nxitrim(char *str)
 {
-      char *ibuf = str, *obuf = str;
-      int i = 0, cnt = 0;
+      char *ibuf = str;
+      int i = 0;
 
       /*
@@ -1101 +1101 @@
                                     int64_t dimension[], int *iType)
   {
-    char *pPtr = NULL;
     pNexusFunction pFunc = handleToNexusFunc(fid);
     return LOCKED_CALL(pFunc->nxgetinfo64(pFunc->pNexusData, rank, dimension, iType));
@@ -1110 +1109 @@
   {
     int i, status;
-    char *pPtr = NULL;
         int64_t dims64[NX_MAXRANK];
     pNexusFunction pFunc = handleToNexusFunc(fid);
@@ -1164 +1162 @@
                                     int iStart[], int iSize[])
   {
-          int i, status, iType, rank;
+          int i, iType, rank;
           int64_t iStart64[NX_MAXRANK], iSize64[NX_MAXRANK];
           if (NXgetinfo64(fid, &rank, iStart64, &iType) != NX_OK)
@@ -1179 +1177 @@
   
   NXstatus  NXgetslab64 (NXhandle fid, void *data, 
-                                    int64_t iStart[], int64_t iSize[])
+                                    const int64_t iStart[], const int64_t iSize[])
   {
     pNexusFunction pFunc = handleToNexusFunc(fid);
@@ -1425 +1423 @@
   char nxurl[1024], exfile[512], expath[512];
   pNexusFunction pFunc = handleToNexusFunc(fid);
-  int64_t rank = 1;
+  int rank = 1;
   int64_t dims[1] = {1};
   

trunk/src/napi4.c

@@ -1618 +1618 @@
 
   
-  NXstatus  NX4getslab64 (NXhandle fid, void *data, int64_t iStart[], int64_t iSize[])
+  NXstatus  NX4getslab64 (NXhandle fid, void *data, const int64_t iStart[], const int64_t iSize[])
   {
     pNexusFile pFile;

trunk/src/napi5.c

@@ -1784 +1784 @@
    /*-------------------------------------------------------------------------*/
 
-   NXstatus  NX5getslab64 (NXhandle fid, void *data, int64_t iStart[], int64_t iSize[])
+   NXstatus  NX5getslab64 (NXhandle fid, void *data, const int64_t iStart[], const int64_t iSize[])
    {
      pNexusFile5 pFile;
@@ -2032 +2032 @@
    {
      pNexusFile5 pFile;
-     char *iname = NULL; 
      hid_t idx;
      int vid;
@@ -2128 +2127 @@
      herr_t ret;
      H5L_info_t link_buff;
-     int size=1024;
-     char linkval_buff[size];
+     char linkval_buff[1024];
      const char *filepath, *objpath;
 
@@ -2139 +2137 @@
      }
 
-     ret = H5Lget_val(pFile->iFID, name, linkval_buff, size, H5P_DEFAULT);
+     ret = H5Lget_val(pFile->iFID, name, linkval_buff, sizeof(linkval_buff), H5P_DEFAULT);
      if (ret < 0) {
        return NX_ERROR;
      }
 
-     ret = H5Lunpack_elink_val(linkval_buff, size, 0, &filepath, &objpath);
+     ret = H5Lunpack_elink_val(linkval_buff, sizeof(linkval_buff), 0, &filepath, &objpath);
      if (ret < 0 || link_buff.type != H5L_TYPE_EXTERNAL) {
        return NX_ERROR;

trunk/src/nxstack.c

@@ -71 +71 @@
 /*----------------------------------------------------------------------*/
 void pushFileStack(pFileStack self, pNexusFunction pDriv, char *file){
-  int length;
+  size_t length;
 
   self->fileStackPointer++;
@@ -123 +123 @@
 /*-----------------------------------------------------------------------*/
 int buildPath(pFileStack self, char *path, int pathlen){
-  int i, totalPathLength;
+  int i;
+  size_t totalPathLength;
   char *totalPath;
 
@@ -129 +130 @@
     totalPathLength += strlen(self->pathStack[i]) + 1;
   }
-  totalPath = malloc(totalPathLength*sizeof(char));
+  totalPath = (char*)malloc(totalPathLength*sizeof(char));
   if(totalPath == NULL){
     return 0;

trunk/src/nxxml.c

@@ -1146 +1146 @@
 /*----------------------------------------------------------------------*/
 NXstatus  NXXgetslab64 (NXhandle fid, void *data, 
-                                   int64_t iStart[], int64_t iSize[]){
+                                   const int64_t iStart[], const int64_t iSize[]){
   pXMLNexus xmlHandle = NULL;
   mxml_node_t *userData = NULL;