diff options
Diffstat (limited to 'libs/pbd3')
| -rw-r--r-- | libs/pbd3/SConscript | 1 | ||||
| -rw-r--r-- | libs/pbd3/base_ui.cc | 1 | ||||
| -rw-r--r-- | libs/pbd3/pathscanner.cc | 2 | ||||
| -rw-r--r-- | libs/pbd3/pbd/error.h | 18 | ||||
| -rw-r--r-- | libs/pbd3/pbd/transmitter.h | 1 | ||||
| -rw-r--r-- | libs/pbd3/pool.cc | 1 | ||||
| -rw-r--r-- | libs/pbd3/transmitter.cc | 6 |
7 files changed, 17 insertions, 13 deletions
diff --git a/libs/pbd3/SConscript b/libs/pbd3/SConscript index 4e64f12d43..2766b3c5ed 100644 --- a/libs/pbd3/SConscript +++ b/libs/pbd3/SConscript @@ -22,6 +22,7 @@ basename.cc base_ui.cc convert.cc dmalloc.cc +error.cc mountpoint.cc pathscanner.cc pool.cc diff --git a/libs/pbd3/base_ui.cc b/libs/pbd3/base_ui.cc index 5598b20021..d3c8d5e4c7 100644 --- a/libs/pbd3/base_ui.cc +++ b/libs/pbd3/base_ui.cc @@ -11,6 +11,7 @@ #include "i18n.h" using namespace std; +using namespace PBD; uint32_t BaseUI::rt_bit = 1; BaseUI::RequestType BaseUI::CallSlot = BaseUI::new_request_type(); diff --git a/libs/pbd3/pathscanner.cc b/libs/pbd3/pathscanner.cc index 5b96284a90..2af227a3a0 100644 --- a/libs/pbd3/pathscanner.cc +++ b/libs/pbd3/pathscanner.cc @@ -27,6 +27,8 @@ #include <pbd/pathscanner.h> #include <pbd/stl_delete.h> +using namespace PBD; + vector<string *> * PathScanner::operator() (const string &dirpath, const string ®exp, bool match_fullpath, bool return_fullpath, diff --git a/libs/pbd3/pbd/error.h b/libs/pbd3/pbd/error.h index cb822e6210..4136f02ee2 100644 --- a/libs/pbd3/pbd/error.h +++ b/libs/pbd3/pbd/error.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-99 Paul Barton-Davis + Copyright (C) 1998-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +17,16 @@ $Id$ */ -#ifndef __libmisc_error_h__ -#define __libmisc_error_h__ +#ifndef __libpbd_error_h__ +#define __libpbd_error_h__ #include "transmitter.h" -extern Transmitter error; -extern Transmitter info; -extern Transmitter warning; -extern Transmitter fatal; +namespace PBD { + extern Transmitter error; + extern Transmitter info; + extern Transmitter warning; + extern Transmitter fatal; +} -#endif // __libmisc_error_h__ +#endif // __libpbd_error_h__ diff --git a/libs/pbd3/pbd/transmitter.h b/libs/pbd3/pbd/transmitter.h index 07fc266bce..357cb9965f 100644 --- a/libs/pbd3/pbd/transmitter.h +++ b/libs/pbd3/pbd/transmitter.h @@ -104,6 +104,7 @@ endmsg (std::ostream &ostr) return ostr; } + extern "C" { void pbd_c_error (const char *); } #endif // __libmisc_transmitter_h__ diff --git a/libs/pbd3/pool.cc b/libs/pbd3/pool.cc index 7318bd4398..089766482d 100644 --- a/libs/pbd3/pool.cc +++ b/libs/pbd3/pool.cc @@ -25,6 +25,7 @@ #include <pbd/error.h> using namespace std; +using namespace PBD; Pool::Pool (string n, unsigned long item_size, unsigned long nitems) { diff --git a/libs/pbd3/transmitter.cc b/libs/pbd3/transmitter.cc index 63f676a04f..46f6639eb9 100644 --- a/libs/pbd3/transmitter.cc +++ b/libs/pbd3/transmitter.cc @@ -28,11 +28,6 @@ using std::string; using std::ios; -Transmitter error (Transmitter::Error); -Transmitter info (Transmitter::Info); -Transmitter fatal (Transmitter::Fatal); -Transmitter warning (Transmitter::Warning); - Transmitter::Transmitter (Channel c) { @@ -110,6 +105,7 @@ Transmitter::does_not_return () } } + extern "C" { void pbd_c_error (const char *str) |