Mercurial > hg > svcore
comparison base/TempDirectory.cpp @ 1221:a1b97df9962e 3.0-integration
Merge from branch msvc2015_64
author | Chris Cannam |
---|---|
date | Thu, 20 Oct 2016 11:16:22 +0100 |
parents | 794b64e62e58 |
children | 70e172e6cc59 |
comparison
equal
deleted
inserted
replaced
1215:f50ded4b951c | 1221:a1b97df9962e |
---|---|
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 |