Changeset 1772 for trunk

Timestamp:

22/11/11 16:58:21 (6 months ago)

Author:

Freddie Akeroyd

Message:

Merge in a few updates from Mantid version. Refs #303

Location:

trunk/bindings/cpp

Files:

• NeXusFile.cpp (modified) (6 diffs)
• NeXusFile.hpp (modified) (2 diffs)
• NeXusStream.hpp (modified) (2 diffs)

trunk/bindings/cpp/NeXusFile.cpp

@@ -165 +165 @@
 }
 
-File::File(char *filename, const NXaccess access) : m_close_handle (true) {
+File::File(const char *filename, const NXaccess access) : m_close_handle (true) {
   this->initOpenFile(string(filename), access);
 }
@@ -269 +269 @@
 
 std::string File::getPath(){
-  char cPath[1024];
-
-  memset(cPath,0,1024*sizeof(char));
-  NXstatus status = NXgetpath(this->m_file_id,cPath, 1024);
+  char cPath[2048];
+
+  memset(cPath,0,sizeof(cPath));
+  NXstatus status = NXgetpath(this->m_file_id,cPath, sizeof(cPath)-1);
   if (status != NX_OK) {
     stringstream msg;
@@ -555 +555 @@
 template <typename NumT>
 void File::putAttr(const std::string& name, const NumT value) {
+  NumT data[1];
+  data[0] = value;
   AttrInfo info;
   info.name = name;
@@ -920 +922 @@
   }
   char* value = new char[info.dims[0]+1]; // probably do not need +1, but being safe
-  this->getData(value);
+  try{
+     this->getData(value);
+  }
+  catch (const Exception& e)
+  {
+    delete[] value;
+    throw e;
+  }
   res = string(value, info.dims[0]);
   delete[] value;
@@ -971 +980 @@
 }
 
-void File::getEntries(std::map<std::string, std::string> & map)
-{
+void File::getEntries(std::map<std::string, std::string> & result)
+{
+  result.clear();
   this->initGroupDir();
   pair<string,string> temp;
@@ -981 +991 @@
     }
     else {
-      map.insert(temp);
+            result.insert(temp);
     }
   }

trunk/bindings/cpp/NeXusFile.hpp

@@ -181 +181 @@
      * \param access How to access the file.
      */
-    File(char *filename, const NXaccess access = NXACC_READ);
+    File(const char *filename, const NXaccess access = NXACC_READ);
 
     /**
@@ -687 +687 @@
      * but avoids the map copy of getEntries().
      *
-     * \param map The map that will be filled with the entries
-     */
-    void getEntries(std::map<std::string, std::string> & map);
+     * \param result The map that will be filled with the entries
+     */
+    void getEntries(std::map<std::string, std::string> & result);
 
     /**

trunk/bindings/cpp/NeXusStream.hpp

@@ -129 +129 @@
         Attr(const std::string& name, const Attr& d) { m_holder = d.m_holder->clone(); setName(name); }
         Attr(const Attr& a) : m_holder(NULL) {  m_holder = a.m_holder->clone(); }
-        Attr& operator=(const Attr& a) { if (this != &a) { delete m_holder; m_holder = a.m_holder->clone(); return *this; } }
+        Attr& operator=(const Attr& a) { if (this != &a) { delete m_holder; m_holder = a.m_holder->clone(); } return *this; }
         void setName(const std::string& name) { m_holder->setName(name); }
         virtual void readFromFile(File& nf) const { m_holder->readFromFile(nf); }
@@ -268 +268 @@
           }
         Data(const Data& d) : ObjectWithAttr(d), m_holder(NULL) { m_holder = d.m_holder->clone(); }
-        Data& operator=(const Data& d) { if (this != &d) { delete m_holder; m_holder = d.m_holder->clone(); return *this; } }
+        Data& operator=(const Data& d) { if (this != &d) { delete m_holder; m_holder = d.m_holder->clone(); } return *this; }
         virtual void readFromFile(File& nf) const;
         virtual void writeToFile(File& nf) const;