Skip to content
Snippets Groups Projects
Commit a56fdc0b authored by Andre Offringa's avatar Andre Offringa
Browse files

Bug 1491: changing to deprecated boost names because aofrequencyfilter won't compile on CEP

parent da7be8e9
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ struct SetInfo ...@@ -41,7 +41,7 @@ struct SetInfo
// This represents the data that is specific for a single thread // This represents the data that is specific for a single thread
struct TaskInfo struct TaskInfo
{ {
TaskInfo() : length(0), convolutionSize(0), table(0), dataColumn(0), realData(0), imagData(0) { } TaskInfo() : length(0), convolutionSize(0.0), table(0), dataColumn(0), realData(0), imagData(0) { }
TaskInfo(const TaskInfo &source) : TaskInfo(const TaskInfo &source) :
length(source.length), length(source.length),
convolutionSize(source.convolutionSize), convolutionSize(source.convolutionSize),
...@@ -61,7 +61,8 @@ struct TaskInfo ...@@ -61,7 +61,8 @@ struct TaskInfo
imagData = source.imagData; imagData = source.imagData;
} }
unsigned length, convolutionSize; unsigned length;
double convolutionSize;
casa::Table *table; casa::Table *table;
casa::ArrayColumn<casa::Complex> *dataColumn; casa::ArrayColumn<casa::Complex> *dataColumn;
float float
...@@ -180,8 +181,8 @@ class ThreadControl ...@@ -180,8 +181,8 @@ class ThreadControl
unsigned _threadCount; unsigned _threadCount;
bool _isFinishing; bool _isFinishing;
boost::mutex _mutex; boost::mutex _mutex;
boost::condition_variable _dataAvailableCondition; boost::condition _dataAvailableCondition;
boost::condition_variable _queueFullCondition; boost::condition _queueFullCondition;
std::deque<TaskInfo> _tasks; std::deque<TaskInfo> _tasks;
boost::mutex _writeMutex; boost::mutex _writeMutex;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment