Switch to unified view

a/src/utils/pathut.h b/src/utils/pathut.h
...
...
14
 *   Free Software Foundation, Inc.,
14
 *   Free Software Foundation, Inc.,
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#ifndef _PATHUT_H_INCLUDED_
17
#ifndef _PATHUT_H_INCLUDED_
18
#define _PATHUT_H_INCLUDED_
18
#define _PATHUT_H_INCLUDED_
19
#include "autoconfig.h"
20
19
#include <unistd.h>
21
#include <unistd.h>
20
22
21
#include <string>
23
#include <string>
22
#include <vector>
24
#include <vector>
23
#include <set>
25
#include <set>
24
26
25
#include "refcntr.h"
27
#include MEMORY_INCLUDE
26
28
27
/// Add a / at the end if none there yet.
29
/// Add a / at the end if none there yet.
28
extern void path_catslash(std::string &s);
30
extern void path_catslash(std::string &s);
29
/// Concatenate 2 paths
31
/// Concatenate 2 paths
30
extern std::string path_cat(const std::string &s1, const std::string &s2);
32
extern std::string path_cat(const std::string &s1, const std::string &s2);
...
...
114
    std::string m_filename;
116
    std::string m_filename;
115
    std::string m_reason;
117
    std::string m_reason;
116
    bool m_noremove;
118
    bool m_noremove;
117
};
119
};
118
120
119
typedef RefCntr<TempFileInternal> TempFile;
121
typedef STD_SHARED_PTR<TempFileInternal> TempFile;
120
122
121
/// Temporary directory class. Recursively deleted by destructor.
123
/// Temporary directory class. Recursively deleted by destructor.
122
class TempDir {
124
class TempDir {
123
public:
125
public:
124
    TempDir();
126
    TempDir();