Changeset 1732 for trunk/bindings

Timestamp:

02/11/11 23:56:35 (7 months ago)

Author:

Freddie Akeroyd

Message:

Merge in Mantid mods from Roman. Refs #297

Location:

trunk/bindings/cpp

Files:

• NeXusException.hpp (modified) (1 diff)
• NeXusFile.cpp (modified) (1 diff)
• NeXusFile.hpp (modified) (1 diff)

trunk/bindings/cpp/NeXusException.hpp

@@ -18 +18 @@
    */
 
-  class Exception : public std::runtime_error
+  class NXDLL_EXPORT Exception : public std::runtime_error
   {
   public:

trunk/bindings/cpp/NeXusFile.cpp

@@ -1088 +1088 @@
 
 template <>
-void File::getAttr(const std::string& name, std::string& value)
+NXDLL_EXPORT void File::getAttr(const std::string& name, std::string& value)
 {
     AttrInfo info;

trunk/bindings/cpp/NeXusFile.hpp

@@ -10 +10 @@
 #ifdef _WIN32
 
-#ifdef _MSC_VER 
+#ifndef _MSC_VER 
 #  define NXDLL_EXPORT
 #else