Mercurial > hg > svcore
comparison base/TempDirectory.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 | 70e172e6cc59 |
comparison
equal
deleted
inserted
replaced
| 1214:77320e522253 | 1222:771a17925576 |
|---|---|
| 23 #include <QMutexLocker> | 23 #include <QMutexLocker> |
| 24 #include <QSettings> | 24 #include <QSettings> |
| 25 | 25 |
| 26 #include <iostream> | 26 #include <iostream> |
| 27 #include <cassert> | 27 #include <cassert> |
| 28 #include <unistd.h> | 28 |
| 29 #include <time.h> | 29 #include <time.h> |
| 30 | 30 |
| 31 TempDirectory * | 31 TempDirectory * |
| 32 TempDirectory::m_instance = new TempDirectory; | 32 TempDirectory::m_instance = new TempDirectory; |
| 33 | 33 |