From cb5ce71d66e1d1f69cc40174cf93c1220e47454f Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 6 Oct 2016 11:32:06 +0300 Subject: [PATCH] 0023359: [CEA 1965] Problem with the method isAlreadyLinkedWith in YACS --- src/engine/OutPort.hxx | 2 +- src/engine/OutputDataStreamPort.hxx | 2 +- src/engine/OutputPort.hxx | 2 +- src/engine/Switch.hxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/OutPort.hxx b/src/engine/OutPort.hxx index eb382b69e..6f750852b 100644 --- a/src/engine/OutPort.hxx +++ b/src/engine/OutPort.hxx @@ -42,7 +42,7 @@ namespace YACS virtual void checkConsistency(LinkInfo& info) const; virtual int edGetNumberOfOutLinks() const; virtual std::set edSetInPort() const = 0; - virtual bool isAlreadyLinkedWith(InPort *with) const = 0; + virtual bool isAlreadyLinkedWith(InPort *withp) const = 0; virtual void getAllRepresented(std::set& represented) const; virtual bool addInPort(InPort *inPort) throw(Exception) = 0; virtual int removeInPort(InPort *inPort, bool forward) throw(Exception) = 0; diff --git a/src/engine/OutputDataStreamPort.hxx b/src/engine/OutputDataStreamPort.hxx index 564d53f7f..8969e9c11 100644 --- a/src/engine/OutputDataStreamPort.hxx +++ b/src/engine/OutputDataStreamPort.hxx @@ -47,7 +47,7 @@ namespace YACS virtual ~OutputDataStreamPort(); virtual OutputDataStreamPort *clone(Node *newHelder) const; std::set edSetInPort() const; - bool isAlreadyLinkedWith(InPort *with) const; + bool isAlreadyLinkedWith(InPort *withp) const; virtual std::string getNameOfTypeOfCurrentInstance() const; virtual bool addInPort(InPort *inPort) throw(Exception); virtual bool edAddInputDataStreamPort(InputDataStreamPort *port) throw(ConversionException); diff --git a/src/engine/OutputPort.hxx b/src/engine/OutputPort.hxx index 69dd1dc35..f36fc8f9a 100644 --- a/src/engine/OutputPort.hxx +++ b/src/engine/OutputPort.hxx @@ -50,7 +50,7 @@ namespace YACS public: virtual ~OutputPort(); std::set edSetInPort() const; - bool isAlreadyLinkedWith(InPort *with) const; + bool isAlreadyLinkedWith(InPort *withp) const; bool isAlreadyInSet(InputPort *inputPort) const; bool isConnected() const; std::string getNameOfTypeOfCurrentInstance() const; diff --git a/src/engine/Switch.hxx b/src/engine/Switch.hxx index 49c620c5c..1ae0a3e34 100644 --- a/src/engine/Switch.hxx +++ b/src/engine/Switch.hxx @@ -40,7 +40,7 @@ namespace YACS private: int edGetNumberOfOutLinks() const; std::set edSetInPort() const; - bool isAlreadyLinkedWith(InPort *with) const; + bool isAlreadyLinkedWith(InPort *withp) const; std::string getNameOfTypeOfCurrentInstance() const; void edRemoveAllLinksLinkedWithMe() throw(Exception); TypeOfChannel getTypeOfChannel() const; -- 2.39.2