Skip to content

Commit

Permalink
refs #7200 MDBoxBase code has to be generated after all
Browse files Browse the repository at this point in the history
how weird, it is abstract class after all.
  • Loading branch information
abuts committed May 30, 2013
1 parent 9540a8f commit 9eb2afe
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace Mantid

//### BEGIN AUTO-GENERATED CODE #################################################################
/* Code below Auto-generated by 'generate_mdevent_declarations.py'
* on 2013-05-30 12:17:00.216000
* on 2013-05-30 12:36:57.329000
*
* DO NOT EDIT!
*/
Expand Down Expand Up @@ -458,4 +458,3 @@ if (CONST_MDEW_MDLEANEVENT_9) funcname<MDLeanEvent<9>, 9>(CONST_MDEW_MDLEANEVENT
} // namespace MDEvents

#endif /* MANTID_MDEVENTS_MDEVENTFACTORY_H_ */

24 changes: 22 additions & 2 deletions Code/Mantid/Framework/MDEvents/src/MDEventFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Mantid
{
//### BEGIN AUTO-GENERATED CODE #################################################################
/* Code below Auto-generated by 'generate_mdevent_declarations.py'
* on 2013-05-30 12:17:00.216000
* on 2013-05-30 12:36:57.329000
*
* DO NOT EDIT!
*/
Expand All @@ -54,6 +54,27 @@ namespace Mantid
template DLLExport class MDLeanEvent<7>;
template DLLExport class MDLeanEvent<8>;
template DLLExport class MDLeanEvent<9>;
// Instantiations for MDBoxBase
template DLLExport class MDBoxBase<MDEvent<1>, 1>;
template DLLExport class MDBoxBase<MDEvent<2>, 2>;
template DLLExport class MDBoxBase<MDEvent<3>, 3>;
template DLLExport class MDBoxBase<MDEvent<4>, 4>;
template DLLExport class MDBoxBase<MDEvent<5>, 5>;
template DLLExport class MDBoxBase<MDEvent<6>, 6>;
template DLLExport class MDBoxBase<MDEvent<7>, 7>;
template DLLExport class MDBoxBase<MDEvent<8>, 8>;
template DLLExport class MDBoxBase<MDEvent<9>, 9>;
template DLLExport class MDBoxBase<MDLeanEvent<1>, 1>;
template DLLExport class MDBoxBase<MDLeanEvent<2>, 2>;
template DLLExport class MDBoxBase<MDLeanEvent<3>, 3>;
template DLLExport class MDBoxBase<MDLeanEvent<4>, 4>;
template DLLExport class MDBoxBase<MDLeanEvent<5>, 5>;
template DLLExport class MDBoxBase<MDLeanEvent<6>, 6>;
template DLLExport class MDBoxBase<MDLeanEvent<7>, 7>;
template DLLExport class MDBoxBase<MDLeanEvent<8>, 8>;
template DLLExport class MDBoxBase<MDLeanEvent<9>, 9>;


// Instantiations for MDBox
template DLLExport class MDBox<MDEvent<1>, 1>;
template DLLExport class MDBox<MDEvent<2>, 2>;
Expand Down Expand Up @@ -351,4 +372,3 @@ namespace Mantid

} // namespace Mantid
} // namespace MDEvents

Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def generate():
print "Generating MDEventFactory"

# Classes that have a .cpp file (and will get an Include line)
classes_cpp = ["MDBox", "MDEventWorkspace", "MDGridBox", "MDBin", "MDBoxIterator"]
classes_cpp = ["MDBoxBase","MDBox", "MDEventWorkspace", "MDGridBox", "MDBin", "MDBoxIterator"]
# All of the classes to instantiate
classes = classes_cpp + mdevent_types

Expand Down

0 comments on commit 9eb2afe

Please sign in to comment.