projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in log message.
[dcpomatic.git]
/
src
/
lib
/
scoped_temporary.h
diff --git
a/src/lib/scoped_temporary.h
b/src/lib/scoped_temporary.h
index 986f565a0896a64e507eba34ba7bdbc1d8c94d14..b78f60541089fc6ed7833e69b8c05e965f0b4720 100644
(file)
--- a/
src/lib/scoped_temporary.h
+++ b/
src/lib/scoped_temporary.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,29
+18,34
@@
*/
*/
+
+#include <dcp/file.h>
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-#include <boost/
noncopyable
.hpp>
+#include <boost/
optional
.hpp>
#include <cstdio>
#include <cstdio>
+
/** @class ScopedTemporary
* @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope.
*/
/** @class ScopedTemporary
* @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope.
*/
-class ScopedTemporary
: public boost::noncopyable
+class ScopedTemporary
{
public:
ScopedTemporary ();
~ScopedTemporary ();
{
public:
ScopedTemporary ();
~ScopedTemporary ();
- /** @return temporary filename */
- boost::filesystem::path file () const {
- return _file;
+ ScopedTemporary (ScopedTemporary const&) = delete;
+ ScopedTemporary& operator= (ScopedTemporary const&) = delete;
+
+ /** @return temporary pathname */
+ boost::filesystem::path path () const {
+ return _path;
}
char const * c_str () const;
}
char const * c_str () const;
- FILE* open (char const *);
- void close ();
+ dcp::File& open (char const *);
private:
private:
- boost::filesystem::path _
file
;
-
FILE* _open
;
+ boost::filesystem::path _
path
;
+
boost::optional<dcp::File> _file
;
};
};