Changeset 1735 for trunk/bindings

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/bindings/cpp

Files:

• CMakeLists.txt (modified) (2 diffs)
• NeXusFile.cpp (modified) (5 diffs)
• NeXusFile.hpp (modified) (1 diff)

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.