benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GCC 4.7 compilation fixes. Now builds on debian wheezy beta2

Browse source
This commit is contained in:
Michael Fisher 2012-08-13 12:55:36 -05:00 committed by Ichthyostega
parent e267e0ad0b
commit f7a7c1c416
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/element-tracker.hpp
View file

@ -114,7 +114,7 @@ namespace lib {
{
REQUIRE (asset, "Attempt to track a NIL element");
remove (*asset);
push_back (asset);
this->push_back (asset);
}
void
@ -124,7 +124,7 @@ namespace lib {
i != _Vec::end() ; ++i )
if (asset == **i) // _Vec contains smart-ptrs
{ // ELM is required to define '=='
erase (i);
this->erase (i);
return;
}
}

4
src/lib/multifact-arg.hpp
View file

@ -111,8 +111,8 @@ namespace lib {
Product
operator() (ID const& id, ARG arg)
{
Creator& func = selectProducer (id);
return wrap (func(arg));
Creator& func = this->selectProducer (id);
return this->wrap (func(arg));
}
};

4
src/lib/multifact.hpp
View file

@ -199,8 +199,8 @@ namespace lib {
Product
operator() (ID const& id)
{
Creator& func = selectProducer (id);
return wrap (func());
Creator& func = this->selectProducer (id);
return this->wrap (func());
}

2
src/lib/scoped-ptrvect.hpp
View file

@ -117,7 +117,7 @@ namespace lib {
REQUIRE (obj);
try
{
push_back (obj);
this->push_back (obj);
return *obj;
}
catch(...)

2
src/lib/time/control-impl.hpp
View file

@ -145,7 +145,7 @@ namespace mutation {
void
attach (SIG const& toNotify)
{
ChangeSignal newListener (ref(toNotify));
ChangeSignal newListener (std::tr1::ref(toNotify));
listeners_.push_back (newListener);
}

2
src/lib/time/control-policy.hpp
View file

@ -243,7 +243,7 @@ namespace mutation {
processValueChange (TAR& target, SRC const& change) ///< standard case: plain value change
{
imposeChange (target, maybeMaterialise(change));
return buildChangedValue (maybeMaterialise(target));
return Link::buildChangedValue (maybeMaterialise(target));
}
static TI