Re #6201. Changing to int64_t versions of methods.

mantidproject · Feb 5, 2013 · c7b71f9 · c7b71f9
1 parent db225cd
commit c7b71f9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -102,7 +102,6 @@ add_subdirectory ( Framework )
 include_directories ( Framework/Kernel/inc )
 include_directories ( Framework/Geometry/inc )
 include_directories ( Framework/API/inc )
-include_directories ( Framework/NexusCPP/inc )
 set ( CORE_MANTIDLIBS Kernel Geometry API )
 
 # Add a target for all GUI tests

diff --git a/Code/Mantid/Framework/DataHandling/src/NexusTester.cpp b/Code/Mantid/Framework/DataHandling/src/NexusTester.cpp
@@ -138,10 +138,10 @@ namespace DataHandling
         fakeData[i] = rand();
     }
 
-    std::vector<int> dims;
-    dims.push_back(int(chunkSize)*NumChunks);
-    std::vector<int> chunkDims;
-    chunkDims.push_back(int(chunkSize));
+    std::vector<int64_t> dims;
+    dims.push_back(int64_t(chunkSize)*NumChunks);
+    std::vector<int64_t> chunkDims;
+    chunkDims.push_back(int64_t(chunkSize));
 
     // Total size in BYTES
     double dataSizeMB = double(chunkSize*NumChunks*sizeof(uint32_t)) / (1024.*1024.);
@@ -157,8 +157,8 @@ namespace DataHandling
       CPUTimer tim;
       for (int i=0; i<NumChunks; i++)
       {
-        std::vector<int> startDims;
-        startDims.push_back(i * int(chunkSize));
+        std::vector<int64_t> startDims;
+        startDims.push_back(i * int64_t(chunkSize));
         file.putSlab(fakeData, startDims, chunkDims);
         prog.report();
       }
@@ -199,8 +199,8 @@ namespace DataHandling
       for (int i=0; i<NumChunks; i++)
       {
         file.openData("FakeData");
-        std::vector<int> startDims;
-        startDims.push_back(i * int(chunkSize));
+        std::vector<int64_t> startDims;
+        startDims.push_back(i * int64_t(chunkSize));
         file.getSlab(fakeData, startDims, chunkDims);
         prog.report();
         file.closeData();

diff --git a/Code/Mantid/Framework/DataHandling/src/SaveNXSPE.cpp b/Code/Mantid/Framework/DataHandling/src/SaveNXSPE.cpp
@@ -229,12 +229,12 @@ namespace Mantid
       nxFile.makeData("data", ::NeXus::FLOAT64, array_dims, false);
       nxFile.makeData("error", ::NeXus::FLOAT64, array_dims, false);
 
-      std::vector<int> slab_start;
-      std::vector<int> slab_size;
+      std::vector<int64_t> slab_start;
+      std::vector<int64_t> slab_size;
 
       // What size slabs are we going to write...
       slab_size.push_back(1);
-      slab_size.push_back((int)nBins);
+      slab_size.push_back((int64_t)nBins);
 
       // And let's start at the beginning
       slab_start.push_back(0);

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/test/CMakeLists.txt
@@ -10,10 +10,10 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/BinaryOperationMDTestHelper.cpp )
   if ( GMOCK_FOUND AND GTEST_FOUND )
     cxxtest_add_test ( MDAlgorithmsTest ${TEST_FILES} ${GMOCK_TEST_FILES})
-    target_link_libraries( MDAlgorithmsTest MDAlgorithms DataHandling CurveFitting Nexus NexusCPP ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
+    target_link_libraries( MDAlgorithmsTest MDAlgorithms DataHandling CurveFitting Nexus ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} ${NEXUS_LIBRARIES} )
   else ()
     cxxtest_add_test ( MDAlgorithmsTest ${TEST_FILES} )
-    target_link_libraries( MDAlgorithmsTest MDAlgorithms DataHandling CurveFitting Nexus NexusCPP)
+    target_link_libraries( MDAlgorithmsTest MDAlgorithms DataHandling CurveFitting Nexus ${NEXUS_LIBRARIES} )
   endif ()
   add_dependencies ( FrameworkTests MDAlgorithmsTest )
   # Add to the 'FrameworkTests' group in VS

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDLeanEvent.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDLeanEvent.h
@@ -307,13 +307,13 @@ namespace MDEvents
         const uint64_t numEvents, const size_t numColumns)
     {
       //TODO: WARNING NEXUS NEEDS TO BE UPDATED TO USE 64-bit ints on Windows.
-      std::vector<int> start(2,0);
-      start[0] = int(startIndex);
+      std::vector<int64_t> start(2,0);
+      start[0] = int64_t(startIndex);
 
       // Specify the dimensions
-      std::vector<int> dims;
-      dims.push_back(int(numEvents));
-      dims.push_back(int(numColumns));
+      std::vector<int64_t> dims;
+      dims.push_back(int64_t(numEvents));
+      dims.push_back(int64_t(numColumns));
 
       // C-style call is much faster than the C++ call.
 //      int dims_ignored[NX_MAXRANK];

diff --git a/Code/Mantid/Framework/Nexus/test/NexusAPITest.h b/Code/Mantid/Framework/Nexus/test/NexusAPITest.h
@@ -119,10 +119,10 @@ class NexusAPITest : public CxxTest::TestSuite
 
     // 2d double data - slab test
     file.makeData("r8_data", ::NeXus::FLOAT64, array_dims, true);
-    vector<int> slab_start;
+    vector<int64_t> slab_start;
     slab_start.push_back(4);
     slab_start.push_back(0);
-    vector<int> slab_size;
+    vector<int64_t> slab_size;
     slab_size.push_back(1);
     slab_size.push_back(4);
     file.putSlab(&(r8_array[16]), slab_start, slab_size);