refs #6449 differences in templates definition.

mantidproject · Apr 6, 2013 · 7745f7d · 7745f7d
1 parent 330da25
commit 7745f7d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBox.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBox.h
@@ -120,8 +120,8 @@ namespace MDEvents
     // add range of events 
     virtual size_t addEvents(const std::vector<MDE> & events);
     // unhide MDBoxBase methods
-    virtual size_t addEventsUnsafe(const std::vector<MDE> & events)
-    {return MDBoxBase::addEventsUnsafe( events);}
+    virtual size_t addEventsUnsafe(const std::vector<MDE> & events);
+
 
     /*--------------->  EVENTS from event data              <-------------------------------------------------------------*/
     virtual void addEvent(const signal_t Signal,const signal_t errorSq,const std::vector<coord_t> &point, uint16_t runIndex,uint32_t detectorId);

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h
@@ -104,10 +104,8 @@ namespace MDEvents
     void addEventUnsafe(const MDE & event);
     void addAndTraceEvent(const MDE & point,size_t index);
     // unhide MDBoxBase methods
-    virtual size_t addEvents(const std::vector<MDE> & events)
-    { return MDBoxBase::addEvents(events); }
-    virtual size_t addEventsUnsafe(const std::vector<MDE> & events)
-    {return MDBoxBase::addEventsUnsafe( events);}
+    virtual size_t addEvents(const std::vector<MDE> & events);
+    virtual size_t addEventsUnsafe(const std::vector<MDE> & events);
 
 
     /*--------------->  EVENTS from event data              <-------------------------------------------------------------*/

diff --git a/Code/Mantid/Framework/MDEvents/src/MDBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
@@ -117,6 +117,12 @@ namespace MDEvents
 
     }
   }
+  // unhide MDBoxBase method
+  TMDE(
+  size_t MDBox)::addEventsUnsafe(const std::vector<MDE> & events)
+  {
+      return MDBoxBase<MDE,nd>::addEventsUnsafe( events);
+  }
 
 
   //-----------------------------------------------------------------------------------------------

diff --git a/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDGridBox.cpp
@@ -38,8 +38,16 @@ namespace MDEvents
   // : MDBoxBase<MDE, nd>(), numBoxes(0), nPoints(0)
   //{
   //}
-
-
+   template<typename MDE,size_t nd>
+    size_t MDGridBox<MDE,nd>::addEvents(const std::vector<MDE> & events)
+    {
+        return MDBoxBase<MDE,nd>::addEvents(events);
+    }
+   template<typename MDE,size_t nd>
+   size_t MDGridBox<MDE,nd>::addEventsUnsafe(const std::vector<MDE> & events)
+   {
+        return MDBoxBase<MDE,nd>::addEventsUnsafe( events);
+   }
 
   //-----------------------------------------------------------------------------------------------
   /** Constructor with a box controller.