Get rid of compilation warnings. Part I.

[modules/shaper.git] / src / Model / Model_Document.cpp

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index ef56b55d561e14f852f8edb0b5e23625975ac130..8469e5e75795520e0bf78a553db2974d72ddf739 100644 (file)
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -104,8 +104,11 @@ static const int TAG_EXTERNAL_CONSTRUCTIONS = 5;
 static const Standard_GUID kEXTERNAL_SHAPE_REF("9aa5dd14-6d34-4a8d-8786-05842fd7bbbd");
 
 Model_Document::Model_Document(const int theID, const std::string theKind)
-    : myID(theID), myKind(theKind), myIsActive(false), myIsSetCurrentFeature(false),
-      myDoc(new TDocStd_Document("BinOcaf"))  // binary OCAF format
+    : myID(theID),
+      myKind(theKind),
+      myDoc(new TDocStd_Document("BinOcaf")),  // binary OCAF format
+      myIsActive(false),
+      myIsSetCurrentFeature(false)
 {
 #ifdef TINSPECTOR
   CDF_Session::CurrentSession()->Directory()->Add(myDoc);
@@ -386,7 +389,6 @@ bool Model_Document::importPart(const char* theFileName,
     TDF_LabelList anAllNewFeatures;
     // Perform the copying twice for correct references:
     // 1. copy labels hierarchy and fill the relocation table
-    TDF_Label aMain = myDoc->Main();
     for (TDF_ChildIterator anIt(aTempDoc->Main()); anIt.More(); anIt.Next()) {
       TDF_Label aCurrentLab = anIt.Value();
       Handle(TDataStd_Comment) aFeatureID;
@@ -990,7 +992,7 @@ bool Model_Document::isOperation() const
 bool Model_Document::isModified()
 {
   // is modified if at least one operation was committed and not undone
-  return myTransactions.size() != myTransactionSave || isOperation();
+  return (int)myTransactions.size() != myTransactionSave || isOperation();
 }
 
 bool Model_Document::canUndo()
@@ -1928,7 +1930,7 @@ ResultPtr Model_Document::findByName(
   }
   if (aNumInHistory) {
     std::map<std::string, std::list<TDF_Label> >::iterator aFind = myNamingNames.find(aName);
-    if (aFind != myNamingNames.end() && aFind->second.size() > aNumInHistory) {
+    if (aFind != myNamingNames.end() && (int)aFind->second.size() > aNumInHistory) {
       std::list<TDF_Label>::reverse_iterator aLibIt = aFind->second.rbegin();
       for(; aNumInHistory != 0; aNumInHistory--)
         aLibIt++;