Mercurial > hg > svcore
comparison data/fileio/FileSource.cpp @ 1222:771a17925576 piper
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Thu, 20 Oct 2016 11:19:34 +0100 |
parents | 794b64e62e58 |
children | cee1be4fb8c1 |
comparison
equal
deleted
inserted
replaced
1214:77320e522253 | 1222:771a17925576 |
---|---|
27 #include <QCoreApplication> | 27 #include <QCoreApplication> |
28 #include <QThreadStorage> | 28 #include <QThreadStorage> |
29 | 29 |
30 #include <iostream> | 30 #include <iostream> |
31 #include <cstdlib> | 31 #include <cstdlib> |
32 | |
33 #include <unistd.h> | |
34 | 32 |
35 //#define DEBUG_FILE_SOURCE 1 | 33 //#define DEBUG_FILE_SOURCE 1 |
36 | 34 |
37 int | 35 int |
38 FileSource::m_count = 0; | 36 FileSource::m_count = 0; |