Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
6d86902a
Commit
6d86902a
authored
Apr 26, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fs/io/TextFile: use std::unique_ptr<>
parent
376f4a2b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
14 deletions
+9
-14
TextFile.cxx
src/fs/io/TextFile.cxx
+4
-11
TextFile.hxx
src/fs/io/TextFile.hxx
+5
-3
No files found.
src/fs/io/TextFile.cxx
View file @
6d86902a
...
@@ -26,11 +26,11 @@
...
@@ -26,11 +26,11 @@
#include <assert.h>
#include <assert.h>
TextFile
::
TextFile
(
Path
path_fs
)
TextFile
::
TextFile
(
Path
path_fs
)
:
file_reader
(
new
FileReader
(
path_fs
)),
:
file_reader
(
std
::
make_unique
<
FileReader
>
(
path_fs
)),
#ifdef ENABLE_ZLIB
#ifdef ENABLE_ZLIB
gunzip_reader
(
new
AutoGunzipReader
(
*
file_reader
)),
gunzip_reader
(
std
::
make_unique
<
AutoGunzipReader
>
(
*
file_reader
)),
#endif
#endif
buffered_reader
(
new
BufferedReader
(
*
buffered_reader
(
std
::
make_unique
<
BufferedReader
>
(
*
#ifdef ENABLE_ZLIB
#ifdef ENABLE_ZLIB
gunzip_reader
gunzip_reader
#else
#else
...
@@ -40,14 +40,7 @@ TextFile::TextFile(Path path_fs)
...
@@ -40,14 +40,7 @@ TextFile::TextFile(Path path_fs)
{
{
}
}
TextFile
::~
TextFile
()
TextFile
::~
TextFile
()
=
default
;
{
delete
buffered_reader
;
#ifdef ENABLE_ZLIB
delete
gunzip_reader
;
#endif
delete
file_reader
;
}
char
*
char
*
TextFile
::
ReadLine
()
TextFile
::
ReadLine
()
...
...
src/fs/io/TextFile.hxx
View file @
6d86902a
...
@@ -23,19 +23,21 @@
...
@@ -23,19 +23,21 @@
#include "util/Compiler.h"
#include "util/Compiler.h"
#include "config.h"
#include "config.h"
#include <memory>
class
Path
;
class
Path
;
class
FileReader
;
class
FileReader
;
class
AutoGunzipReader
;
class
AutoGunzipReader
;
class
BufferedReader
;
class
BufferedReader
;
class
TextFile
{
class
TextFile
{
FileReader
*
const
file_reader
;
const
std
::
unique_ptr
<
FileReader
>
file_reader
;
#ifdef ENABLE_ZLIB
#ifdef ENABLE_ZLIB
AutoGunzipReader
*
const
gunzip_reader
;
const
std
::
unique_ptr
<
AutoGunzipReader
>
gunzip_reader
;
#endif
#endif
BufferedReader
*
const
buffered_reader
;
const
std
::
unique_ptr
<
BufferedReader
>
buffered_reader
;
public
:
public
:
explicit
TextFile
(
Path
path_fs
);
explicit
TextFile
(
Path
path_fs
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment