Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN

Conflicts:
	src/ModelAPI/ModelAPI.i
	src/ModelAPI/ModelAPI_Session.cpp

diff --cc CMakeLists.txt
Simple merge

diff --cc msvc10_env.bat
Simple merge

diff --cc src/Events/Events_Loop.cpp
index 189516ae090cd9c97882d3015b61b3508bee85eb,9447c376b97c6a4f017be8206e8c13f41325fed6..f9ccd81eca3e7857cf3b5849e261fa93d823db3c
--- 1/src/Events/Events_Loop.cpp
--- 2/src/Events/Events_Loop.cpp
+++ b/src/Events/Events_Loop.cpp
@@@ -119,12 -119,10 +119,12 @@@ void Events_Loop::flush(const Events_ID
      myGroups.find(theID.eventText());
    if (aMyGroup != myGroups.end()) {  // really sends
      myFlushed.insert(theID.myID);
-     boost::shared_ptr<Events_Message> aGroup = aMyGroup->second;
+     std::shared_ptr<Events_Message> aGroup = aMyGroup->second;
      myGroups.erase(aMyGroup);
      send(aGroup, false);
 -    myFlushed.erase(myFlushed.find(theID.myID));
 +    std::set<char*>::iterator anIt = myFlushed.find(theID.myID);
 +    if (anIt != myFlushed.end())
 +      myFlushed.erase(myFlushed.find(theID.myID));
    }
  }
  

diff --cc src/Model/Model_Session.cpp
Simple merge

diff --cc src/ModelAPI/ModelAPI.i
index cc31faa0f1d6aa200d12eaad381de47ca499070e,3017bac28f2df63cc839566b92a669091918014b..d1ffd5643561aae44863ce92451cad2ad1f295ca
--- 1/src/ModelAPI/ModelAPI.i
--- 2/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@@ -52,14 -48,9 +57,14 @@@
  %include "typemaps.i"
  %include "std_string.i"
  %include "std_list.i"
+ %include "std_shared_ptr.i"
  
- // boost pointers
- %include "boost_shared_ptr.i"
 +// directors
 +%feature("director") ModelAPI_Plugin;
 +%feature("director") ModelAPI_Object;
 +%feature("director") ModelAPI_Feature;
 +
+ // shared pointers
  // For ModelAPI_ResultConstruction.shape()
  %shared_ptr(GeomAPI_Interface)
  %shared_ptr(GeomAPI_Shape)
@@@ -112,29 -108,17 +124,37 @@@
  %include "ModelAPI_ResultConstruction.h"
  %include "ModelAPI_ResultBody.h"
  %include "ModelAPI_ResultPart.h"
+ %include "ModelAPI_ResultGroup.h"
+ %include "ModelAPI_ResultParameters.h"
+ %include "ModelAPI_Tools.h"
  
- %template(ObjectList) std::list<boost::shared_ptr<ModelAPI_Object> >;
- %template(ResultList) std::list<boost::shared_ptr<ModelAPI_Result> >;
+ %template(ObjectList) std::list<std::shared_ptr<ModelAPI_Object> >;
+ %template(ResultList) std::list<std::shared_ptr<ModelAPI_Result> >;
  
- %template(modelAPI_Feature)          boost_cast<ModelAPI_Feature, ModelAPI_Object>;
- %template(modelAPI_CompositeFeature) boost_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
 +template<class T1, class T2> boost::shared_ptr<T1> boost_cast(boost::shared_ptr<T2> theObject);
 +
 +// Feature casts
++%template(modelAPI_Feature)          shared_ptr_cast<ModelAPI_Feature, ModelAPI_Object>;
++%template(modelAPI_CompositeFeature) shared_ptr_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
+ template<class T1, class T2> std::shared_ptr<T1> shared_ptr_cast(std::shared_ptr<T2> theObject);
+ %template(modelAPI_CompositeFeature) shared_ptr_cast<ModelAPI_CompositeFeature, ModelAPI_Feature>;
+ %template(modelAPI_ResultConstruction) shared_ptr_cast<ModelAPI_ResultConstruction, ModelAPI_Result>;
+ %template(modelAPI_ResultBody) shared_ptr_cast<ModelAPI_ResultBody, ModelAPI_Result>;
+ %template(modelAPI_ResultPart) shared_ptr_cast<ModelAPI_ResultPart, ModelAPI_Result>;
  
 +// Result casts
 +%template(modelAPI_ResultConstruction) boost_cast<ModelAPI_ResultConstruction, ModelAPI_Result>;
 +%template(modelAPI_ResultBody)         boost_cast<ModelAPI_ResultBody, ModelAPI_Result>;
 +%template(modelAPI_ResultPart)         boost_cast<ModelAPI_ResultPart, ModelAPI_Result>;
  
 +// Attribute casts
 +%template(modelAPI_AttributeDocRef)        boost_cast<ModelAPI_AttributeDocRef, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeDouble)        boost_cast<ModelAPI_AttributeDouble, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeInteger)       boost_cast<ModelAPI_AttributeInteger, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeString)        boost_cast<ModelAPI_AttributeString, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeReference)     boost_cast<ModelAPI_AttributeReference, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeRefAttr)       boost_cast<ModelAPI_AttributeRefAttr, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeBoolean)       boost_cast<ModelAPI_AttributeBoolean, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeSelection)     boost_cast<ModelAPI_AttributeSelection, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeSelectionList) boost_cast<ModelAPI_AttributeSelectionList, ModelAPI_Attribute>;
 +%template(modelAPI_AttributeRefList)       boost_cast<ModelAPI_AttributeRefList, ModelAPI_Attribute>;

diff --cc src/ModelAPI/ModelAPI_Plugin.h
Simple merge

diff --cc src/ModelAPI/ModelAPI_Session.cpp
index ccb0c8f52bc9997439c88a9d76562a2a8b3e4adb,c7b784d3ac7f51fc2e63277450b4aad6cc7fc071..29c251031c4d43bf25fa7663dbd09b277b849b83
--- 1/src/ModelAPI/ModelAPI_Session.cpp
--- 2/src/ModelAPI/ModelAPI_Session.cpp
+++ b/src/ModelAPI/ModelAPI_Session.cpp
@@@ -42,9 -42,13 +42,9 @@@ using namespace std
  #endif
  
  /// Manager that will be initialized from Model package, one per application
- boost::shared_ptr<ModelAPI_Session> MY_MANAGER;
+ std::shared_ptr<ModelAPI_Session> MY_MANAGER;
  
- void ModelAPI_Session::setSession(boost::shared_ptr<ModelAPI_Session> theManager)
 -ModelAPI_Session::ModelAPI_Session()
 -{
 -}
 -
+ void ModelAPI_Session::setSession(std::shared_ptr<ModelAPI_Session> theManager)
  {
    MY_MANAGER = theManager;
  }

diff --cc src/ModelAPI/ModelAPI_Session.h
Simple merge