Changeset 1468

Timestamp:

08/05/10 17:45:28 (21 months ago)

Author:

Freddie Akeroyd

Message:

Add malloc() and free() methods Refs #227

Location:

trunk/bindings/cpp

Files:

• NeXusFile.cpp (modified) (3 diffs)
• NeXusFile.hpp (modified) (1 diff)

trunk/bindings/cpp/NeXusFile.cpp

@@ -118 +118 @@
 static int check_char_too_big[1 - sizeof(char) + ARRAY_OFFSET]; // error if char > 1 byte
 
-static void inner_malloc(void* & data, std::vector<int>& dims, NXnumtype type) {
+static void inner_malloc(void* & data, const std::vector<int>& dims, NXnumtype type) {
   int rank = dims.size();
   int c_dims[NX_MAXRANK];
@@ -963 +963 @@
   }
 }
+
+template<typename NumT>
+void File::malloc(NumT*& data, const Info& info)
+{
+    if (getType<NumT>() != info.type)
+    {
+        throw Exception("Type mismatch in malloc()");
+    }
+    inner_malloc((void*&)data, info.dims, info.type);
+}
+
+template<typename NumT>
+void File::free(NumT*& data)
+{
+    inner_free((void*&)data);
+}
+
 }
 
@@ -1193 +1210 @@
 template 
 NXDLL_EXPORT void File::getAttr(const std::string& name, int& value);
+
+template
+NXDLL_EXPORT void File::malloc(int*& data, const Info& info);
+template
+NXDLL_EXPORT void File::malloc(float*& data, const Info& info);
+template
+NXDLL_EXPORT void File::malloc(double*& data, const Info& info);
+
+template
+NXDLL_EXPORT void File::free(int*& data);
+template
+NXDLL_EXPORT void File::free(float*& data);
+template
+NXDLL_EXPORT void File::free(double*& data);

trunk/bindings/cpp/NeXusFile.hpp

@@ -162 +162 @@
     void flush();
 
+    template<typename NumT>
+    void malloc(NumT*& data, const Info& info);
+
+    template<typename NumT>
+    void free(NumT*& data);
+
     /**
      * Create a new group.