Renamed id to _id for ObjC compatibility.
git-svn-id: svn://localhost/ardour2/trunk@826 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e706680e3d
commit
c5619a0f98
@ -25,7 +25,7 @@ ID::init ()
|
|||||||
ID::ID ()
|
ID::ID ()
|
||||||
{
|
{
|
||||||
Glib::Mutex::Lock lm (*counter_lock);
|
Glib::Mutex::Lock lm (*counter_lock);
|
||||||
id = _counter++;
|
_id = _counter++;
|
||||||
}
|
}
|
||||||
|
|
||||||
ID::ID (string str)
|
ID::ID (string str)
|
||||||
@ -36,14 +36,14 @@ ID::ID (string str)
|
|||||||
int
|
int
|
||||||
ID::string_assign (string str)
|
ID::string_assign (string str)
|
||||||
{
|
{
|
||||||
return sscanf (str.c_str(), "%" PRIu64, &id) != 0;
|
return sscanf (str.c_str(), "%" PRIu64, &_id) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ID::print (char* buf) const
|
ID::print (char* buf) const
|
||||||
{
|
{
|
||||||
/* XXX sizeof buf is unknown. bad API design */
|
/* XXX sizeof buf is unknown. bad API design */
|
||||||
snprintf (buf, 16, "%" PRIu64, id);
|
snprintf (buf, 16, "%" PRIu64, _id);
|
||||||
}
|
}
|
||||||
|
|
||||||
string ID::to_s() const
|
string ID::to_s() const
|
||||||
@ -61,10 +61,10 @@ ID::operator= (string str)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ostream&
|
ostream&
|
||||||
operator<< (ostream& ostr, const ID& id)
|
operator<< (ostream& ostr, const ID& _id)
|
||||||
{
|
{
|
||||||
char buf[32];
|
char buf[32];
|
||||||
id.print (buf);
|
_id.print (buf);
|
||||||
ostr << buf;
|
ostr << buf;
|
||||||
return ostr;
|
return ostr;
|
||||||
}
|
}
|
||||||
|
@ -14,17 +14,17 @@ class ID {
|
|||||||
ID (std::string);
|
ID (std::string);
|
||||||
|
|
||||||
bool operator== (const ID& other) const {
|
bool operator== (const ID& other) const {
|
||||||
return id == other.id;
|
return _id == other._id;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator!= (const ID& other) const {
|
bool operator!= (const ID& other) const {
|
||||||
return id != other.id;
|
return _id != other._id;
|
||||||
}
|
}
|
||||||
|
|
||||||
ID& operator= (std::string);
|
ID& operator= (std::string);
|
||||||
|
|
||||||
bool operator< (const ID& other) const {
|
bool operator< (const ID& other) const {
|
||||||
return id < other.id;
|
return _id < other._id;
|
||||||
}
|
}
|
||||||
|
|
||||||
void print (char* buf) const;
|
void print (char* buf) const;
|
||||||
@ -35,7 +35,7 @@ class ID {
|
|||||||
static void init ();
|
static void init ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint64_t id;
|
uint64_t _id;
|
||||||
int string_assign (std::string);
|
int string_assign (std::string);
|
||||||
|
|
||||||
static Glib::Mutex* counter_lock;
|
static Glib::Mutex* counter_lock;
|
||||||
|
Loading…
Reference in New Issue
Block a user