ERR: ElementCombinationGenerator::ReplacePortion needs to be a friend of ElementCombinationGenerator so that it can get access to ElementCombinationGenerator::Substitution. Also fixed one minor problem for HP build.
This commit is contained in:
parent
ddec29c52d
commit
489e91a1f7
|
@ -228,6 +228,8 @@ private:
|
||||||
* Represent the "$SomeSetName" portion of an input string. This has a
|
* Represent the "$SomeSetName" portion of an input string. This has a
|
||||||
* reference to the Substitution holding the real output to generate.
|
* reference to the Substitution holding the real output to generate.
|
||||||
*/
|
*/
|
||||||
|
class ReplacePortion;
|
||||||
|
friend class ReplacePortion;
|
||||||
class ReplacePortion: public Portion
|
class ReplacePortion: public Portion
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -364,7 +366,7 @@ ElementCombinationGenerator
|
||||||
|
|
||||||
// Put together all the pieces, with substitutions.
|
// Put together all the pieces, with substitutions.
|
||||||
for(Portions::const_iterator i = m_Portions.begin();
|
for(Portions::const_iterator i = m_Portions.begin();
|
||||||
i != m_Portions.end(); ++i)
|
i != Portions::const_iterator(m_Portions.end()); ++i)
|
||||||
{
|
{
|
||||||
// See if there is a class associated with this portion.
|
// See if there is a class associated with this portion.
|
||||||
const cmCableClass* curClassPortion = (*i)->GetClass();
|
const cmCableClass* curClassPortion = (*i)->GetClass();
|
||||||
|
|
Loading…
Reference in New Issue