changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place

This commit is contained in:
Dhanya Maliakal
2017-06-19 14:29:45 +02:00
parent c2af014dad
commit e2e25f6e62
7 changed files with 83 additions and 69 deletions

View File

@ -171,7 +171,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
\returns parameter
*/
virtual char *getNetworkParameter(networkParameter i)=0;
virtual string getNetworkParameter(networkParameter i)=0;
/**
sets the network parameters (implemented for gotthard)
@ -180,7 +180,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
\returns parameter
*/
virtual char *setNetworkParameter(networkParameter i, string s)=0;
virtual string setNetworkParameter(networkParameter i, string s)=0;
/**
changes/gets the port number