smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

fix errors in manual conflict resolution

Browse source
This commit is contained in:
Paul Davis 2014-06-02 11:42:35 -04:00
parent 8c9749e42f
commit 7f18913e6d
4 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/file_source.h
View file

@ -85,9 +85,6 @@ public:
void existence_check ();
virtual void prevent_deletion ();
void existence_check ();
virtual void prevent_deletion ();
protected:
FileSource (Session& session, DataType type,
const std::string& path,

2
libs/ardour/ardour/smf_source.h
View file

@ -81,8 +81,6 @@ public:
void prevent_deletion ();
void prevent_deletion ();
protected:
void set_path (const std::string& newpath);

1
libs/pbd/clear_dir.cc
View file

@ -33,6 +33,7 @@ using PBD::closedir;
#include <string.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <glibmm/miscutils.h>
#include "pbd/error.h"

2
libs/pbd/pbd/clear_dir.h
View file

@ -29,8 +29,6 @@
namespace PBD {
LIBPBD_API int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
LIBPBD_API void remove_directory (const std::string& dir);
int clear_directory (const std::string&, size_t* = 0, std::vector<std::string>* = 0);
void remove_directory (const std::string& dir);
}
#endif /* __pbd_clear_dir_h__ */