Refs #5118 fix windows build I hope

mantidproject · Apr 18, 2012 · 4daf6e3 · 4daf6e3
1 parent baa2f78
commit 4daf6e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h
@@ -296,8 +296,13 @@ namespace MDEvents
 
         // Create the event with signal, error squared,
         // the runIndex, the detectorID, and the centers
+#ifdef _WIN32
+        events.push_back( MDEvent<nd>(float(data[ii]), float(data[ii + 1]),
+            uint16_t(data[ii + 2]), int32_t(data[ii+3]), centers) );
+#else
         events.emplace_back( float(data[ii]), float(data[ii + 1]),
             uint16_t(data[ii + 2]), int32_t(data[ii+3]), centers );
+#endif
       }
 
       // Release the memory (all has been COPIED into MDLeanEvent's)

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDLeanEvent.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDLeanEvent.h
@@ -534,7 +534,11 @@ namespace MDEvents
         coord_t * centers = data + ii+2;
 
         // Create the event with signal, error squared, and the centers
+#ifdef _WIN32
+        events.push_back( MDLeanEvent<nd>(float(data[ii]), float(data[ii + 1]), centers) );
+#else
         events.emplace_back( float(data[ii]), float(data[ii + 1]), centers );
+#endif
       }
 
       // Release the memory (all has been COPIED into MDLeanEvent's)