diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-08-15 12:07:56 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-08-15 12:07:56 +0000 |
| commit | c5619a0f981161b441da1216de1f9c2e26190768 (patch) | |
| tree | b56359050097805d2ebeaa63c594ef5cc5d5e4aa /libs/pbd/id.cc | |
| parent | e706680e3d8517496944e04b7f0f6bd4746b939a (diff) | |
Renamed id to _id for ObjC compatibility.
git-svn-id: svn://localhost/ardour2/trunk@826 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd/id.cc')
| -rw-r--r-- | libs/pbd/id.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc index 0de0d052c3..ab7806873e 100644 --- a/libs/pbd/id.cc +++ b/libs/pbd/id.cc @@ -25,7 +25,7 @@ ID::init () ID::ID () { Glib::Mutex::Lock lm (*counter_lock); - id = _counter++; + _id = _counter++; } ID::ID (string str) @@ -36,14 +36,14 @@ ID::ID (string str) int ID::string_assign (string str) { - return sscanf (str.c_str(), "%" PRIu64, &id) != 0; + return sscanf (str.c_str(), "%" PRIu64, &_id) != 0; } void ID::print (char* buf) const { /* XXX sizeof buf is unknown. bad API design */ - snprintf (buf, 16, "%" PRIu64, id); + snprintf (buf, 16, "%" PRIu64, _id); } string ID::to_s() const @@ -61,10 +61,10 @@ ID::operator= (string str) } ostream& -operator<< (ostream& ostr, const ID& id) +operator<< (ostream& ostr, const ID& _id) { char buf[32]; - id.print (buf); + _id.print (buf); ostr << buf; return ostr; } |