Changeset 1438

Timestamp:

28/02/10 07:33:49 (2 years ago)

Author:

Pedro.vicente

Message:

refs #205
disabled the declspec(dllexport) and declspec(dllexport) macros
eliminated NXnumtype getType(char number), it causes compiling errors due to NXnumtype getType(int8_t number)

tested : Visual Studio 2008, Linux 2.6.18 x86_64 with gcc 4.1.2

Location:

trunk

Files:

• README_VS2008.pdf (added)
• bindings/cpp/NeXusFile.cpp (modified) (2 diffs)
• bindings/cpp/NeXusFile.hpp (modified) (2 diffs)
• windows/README_VS2008.pdf (deleted)
• windows/bindings/cpp/nexusCPP.vcproj (modified) (2 diffs)

trunk/bindings/cpp/NeXusFile.cpp

@@ -41 +41 @@
   }
 
+  /*
   template<>
   NXDLL_EXPORT NXnumtype getType(char number) {
@@ -47 +48 @@
     throw Exception(msg.str());
   }
+  */
 
   // template specialisations for types we know 

trunk/bindings/cpp/NeXusFile.hpp

@@ -9 +9 @@
 
 #ifdef _WIN32
+
+#ifdef _MSC_VER 
+#  define NXDLL_EXPORT
+#else
 #  if IN_NEXUS_CPP_LIBRARY
 #    define NXDLL_EXPORT __declspec(dllexport)
@@ -14 +18 @@
 #    define NXDLL_EXPORT __declspec(dllimport)
 #  endif
-#else
+#endif /* _MSC_VER */
+
+#else /* _WIN32 */
 #  define NXDLL_EXPORT 
 #endif /* _WIN32 */

trunk/windows/bindings/cpp/nexusCPP.vcproj

@@ -43 +43 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\..\..\include;..\..\..\Windows_extra\include"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -107 +107 @@
                                 EnableIntrinsicFunctions="true"
                                 AdditionalIncludeDirectories="..\..\..\include;..\..\..\Windows_extra\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE"
                                 RuntimeLibrary="0"
                                 EnableFunctionLevelLinking="true"