diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:42:35 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:42:35 -0400 |
| commit | 7f18913e6de848dddcb4a76841992dd2d6796d52 (patch) | |
| tree | cd37044dc121e6746a29a373b915ce1a763c2882 | |
| parent | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (diff) | |
fix errors in manual conflict resolution
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/smf_source.h | 2 | ||||
| -rw-r--r-- | libs/pbd/clear_dir.cc | 1 | ||||
| -rw-r--r-- | libs/pbd/pbd/clear_dir.h | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index c0e4fba0de..37a7e67d2e 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -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, diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 44d965a4f6..93adfd71f9 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -81,8 +81,6 @@ public: void prevent_deletion (); - void prevent_deletion (); - protected: void set_path (const std::string& newpath); diff --git a/libs/pbd/clear_dir.cc b/libs/pbd/clear_dir.cc index 36c6fcf9f8..c38713897b 100644 --- a/libs/pbd/clear_dir.cc +++ b/libs/pbd/clear_dir.cc @@ -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" diff --git a/libs/pbd/pbd/clear_dir.h b/libs/pbd/pbd/clear_dir.h index efef67012d..f669b84485 100644 --- a/libs/pbd/pbd/clear_dir.h +++ b/libs/pbd/pbd/clear_dir.h @@ -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__ */ |