From: sbh <sergey.belash@opencascade.com>
Date: Fri, 23 May 2014 04:02:53 +0000 (+0400)
Subject: Hotfix to make source compilable under linux.
X-Git-Tag: V_0.2~24^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=afaf6f0d254de478da37f984674a71e296cb3404;p=modules%2Fshaper.git

Hotfix to make source compilable under linux.
---

diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp
index 35606208d..538305efb 100644
--- a/src/Model/Model_Events.cpp
+++ b/src/Model/Model_Events.cpp
@@ -6,30 +6,30 @@
 #include <Events_Loop.h>
 
 // DELETED methods
-Events_MessageGroup* Model_FeatureDeletedMessage::newEmpty() {
-  return new Model_FeatureDeletedMessage(myDoc, "");
-}
-
-Model_FeatureDeletedMessage::Model_FeatureDeletedMessage(
-  const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
-  : Events_MessageGroup(messageId(), 0), myDoc(theDoc)
-
-{
-  if (!theGroup.empty())
-    myGroups.insert(theGroup);
-}
-
-const Events_ID Model_FeatureDeletedMessage::messageId()
-{
-  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
-  return MY_ID;
-}
-
-void Model_FeatureDeletedMessage::Join(Events_MessageGroup& theJoined)
-{
-  Model_FeatureDeletedMessage* aJoined = dynamic_cast<Model_FeatureDeletedMessage*>(&theJoined);
-  std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
-  for(; aGIter != aJoined->myGroups.end(); aGIter++) {
-    myGroups.insert(*aGIter);
-  }
-}
+//Events_MessageGroup* Model_FeatureDeletedMessage::newEmpty() {
+//  return new Model_FeatureDeletedMessage(myDoc, "");
+//}
+//
+//Model_FeatureDeletedMessage::Model_FeatureDeletedMessage(
+//  const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
+//  : Events_MessageGroup(messageId(), 0), myDoc(theDoc)
+//
+//{
+//  if (!theGroup.empty())
+//    myGroups.insert(theGroup);
+//}
+//
+//const Events_ID Model_FeatureDeletedMessage::messageId()
+//{
+//  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
+//  return MY_ID;
+//}
+//
+//void Model_FeatureDeletedMessage::Join(Events_MessageGroup& theJoined)
+//{
+//  Model_FeatureDeletedMessage* aJoined = dynamic_cast<Model_FeatureDeletedMessage*>(&theJoined);
+//  std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
+//  for(; aGIter != aJoined->myGroups.end(); aGIter++) {
+//    myGroups.insert(*aGIter);
+//  }
+//}
diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h
index 6f8631fb3..0bce1c980 100644
--- a/src/Model/Model_Events.h
+++ b/src/Model/Model_Events.h
@@ -59,11 +59,11 @@ class Model_FeatureDeletedMessage : public Events_MessageGroup {
   std::set<std::string> myGroups; ///< group identifiers that contained the deleted feature
 public:
   /// creates a message by initialization of fields
-  Model_FeatureDeletedMessage(const boost::shared_ptr<ModelAPI_Document>& theDoc,
-    const std::string& theGroup);
+//  Model_FeatureDeletedMessage(const boost::shared_ptr<ModelAPI_Document>& theDoc,
+//    const std::string& theGroup);
 
   /// Returns the ID of this message (EVENT_FEATURE_DELETED)
-  static const Events_ID messageId();
+//  static const Events_ID messageId();
 
   /// Returns the feature that has been updated
   boost::shared_ptr<ModelAPI_Document> document() const {return myDoc;}
@@ -72,10 +72,38 @@ public:
   const std::set<std::string >& groups() const {return myGroups;}
 
   //! Creates a new empty group (to store it in the loop before flush)
-  virtual Events_MessageGroup* newEmpty();
+//  virtual Events_MessageGroup* newEmpty();
 
   //! Allows to join the given message with the current one
-  virtual void Join(Events_MessageGroup& theJoined);
+//  virtual void Join(Events_MessageGroup& theJoined);
+
+  Events_MessageGroup* newEmpty() {
+    return new Model_FeatureDeletedMessage(myDoc, "");
+  }
+
+  Model_FeatureDeletedMessage(
+    const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
+    : Events_MessageGroup(messageId(), 0), myDoc(theDoc)
+
+  {
+    if (!theGroup.empty())
+      myGroups.insert(theGroup);
+  }
+
+  const Events_ID messageId()
+  {
+    static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
+    return MY_ID;
+  }
+
+  void Join(Events_MessageGroup& theJoined)
+  {
+    Model_FeatureDeletedMessage* aJoined = dynamic_cast<Model_FeatureDeletedMessage*>(&theJoined);
+    std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
+    for(; aGIter != aJoined->myGroups.end(); aGIter++) {
+      myGroups.insert(*aGIter);
+    }
+  }
 };
 
 #endif