merge resolved

This commit is contained in:
2019-08-09 11:12:31 +02:00
7 changed files with 127 additions and 13 deletions

View File

@ -68,6 +68,8 @@
// typedef char mystring[MAX_STR_LENGTH];
#ifdef __cplusplus
class slsDetectorDefs {
public:
@ -1297,3 +1299,13 @@ typedef struct {
#else
} sls_detector_module;
#endif
#ifdef __cplusplus
//TODO! discuss this
#include <vector> //hmm... but currently no way around
namespace sls{
using Positions = const std::vector<int> &;
using defs = slsDetectorDefs;
}
#endif