Ver Fonte

Replaced depreacated std::auto_ptr with std::unique_ptr

mensinda há 9 anos atrás
pai
commit
cff5b0d1a0
7 ficheiros alterados com 11 adições e 11 exclusões
  1. 1 1
      code/3DSExporter.cpp
  2. 1 1
      code/Exporter.cpp
  3. 4 4
      code/IFCLoader.cpp
  4. 2 2
      code/IFCMaterial.cpp
  5. 1 1
      code/IFCUtil.cpp
  6. 1 1
      code/STEPFile.h
  7. 1 1
      code/STEPFileReader.cpp

+ 1 - 1
code/3DSExporter.cpp

@@ -164,7 +164,7 @@ void ExportScene3DS(const char* pFile, IOSystem* pIOSystem, const aiScene* pScen
     // in |Exporter::ExportFormatEntry|.
     // in |Exporter::ExportFormatEntry|.
     aiScene* scenecopy_tmp;
     aiScene* scenecopy_tmp;
     SceneCombiner::CopyScene(&scenecopy_tmp,pScene);
     SceneCombiner::CopyScene(&scenecopy_tmp,pScene);
-    std::auto_ptr<aiScene> scenecopy(scenecopy_tmp);
+    std::unique_ptr<aiScene> scenecopy(scenecopy_tmp);
 
 
     SplitLargeMeshesProcess_Triangle tri_splitter;
     SplitLargeMeshesProcess_Triangle tri_splitter;
     tri_splitter.SetLimit(0xffff);
     tri_splitter.SetLimit(0xffff);

+ 1 - 1
code/Exporter.cpp

@@ -324,7 +324,7 @@ aiReturn Exporter :: Export( const aiScene* pScene, const char* pFormatId, const
                 aiScene* scenecopy_tmp;
                 aiScene* scenecopy_tmp;
                 SceneCombiner::CopyScene(&scenecopy_tmp,pScene);
                 SceneCombiner::CopyScene(&scenecopy_tmp,pScene);
 
 
-                std::auto_ptr<aiScene> scenecopy(scenecopy_tmp);
+                std::unique_ptr<aiScene> scenecopy(scenecopy_tmp);
                 const ScenePrivateData* const priv = ScenePriv(pScene);
                 const ScenePrivateData* const priv = ScenePriv(pScene);
 
 
                 // steps that are not idempotent, i.e. we might need to run them again, usually to get back to the
                 // steps that are not idempotent, i.e. we might need to run them again, usually to get back to the

+ 4 - 4
code/IFCLoader.cpp

@@ -423,7 +423,7 @@ void ResolveObjectPlacement(aiMatrix4x4& m, const IfcObjectPlacement& place, Con
 bool ProcessMappedItem(const IfcMappedItem& mapped, aiNode* nd_src, std::vector< aiNode* >& subnodes_src, unsigned int matid, ConversionData& conv)
 bool ProcessMappedItem(const IfcMappedItem& mapped, aiNode* nd_src, std::vector< aiNode* >& subnodes_src, unsigned int matid, ConversionData& conv)
 {
 {
     // insert a custom node here, the cartesian transform operator is simply a conventional transformation matrix
     // insert a custom node here, the cartesian transform operator is simply a conventional transformation matrix
-    std::auto_ptr<aiNode> nd(new aiNode());
+    std::unique_ptr<aiNode> nd(new aiNode());
     nd->mName.Set("IfcMappedItem");
     nd->mName.Set("IfcMappedItem");
 
 
     // handle the Cartesian operator
     // handle the Cartesian operator
@@ -684,7 +684,7 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
     }
     }
 
 
     // add an output node for this spatial structure
     // add an output node for this spatial structure
-    std::auto_ptr<aiNode> nd(new aiNode());
+    std::unique_ptr<aiNode> nd(new aiNode());
     nd->mName.Set(el.GetClassName()+"_"+(el.Name?el.Name.Get():"Unnamed")+"_"+el.GlobalId);
     nd->mName.Set(el.GetClassName()+"_"+(el.Name?el.Name.Get():"Unnamed")+"_"+el.GlobalId);
     nd->mParent = parent;
     nd->mParent = parent;
 
 
@@ -771,7 +771,7 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
                     const IfcFeatureElementSubtraction& open = fills->RelatedOpeningElement;
                     const IfcFeatureElementSubtraction& open = fills->RelatedOpeningElement;
 
 
                     // move opening elements to a separate node since they are semantically different than elements that are just 'contained'
                     // move opening elements to a separate node since they are semantically different than elements that are just 'contained'
-                    std::auto_ptr<aiNode> nd_aggr(new aiNode());
+                    std::unique_ptr<aiNode> nd_aggr(new aiNode());
                     nd_aggr->mName.Set("$RelVoidsElement");
                     nd_aggr->mName.Set("$RelVoidsElement");
                     nd_aggr->mParent = nd.get();
                     nd_aggr->mParent = nd.get();
 
 
@@ -816,7 +816,7 @@ aiNode* ProcessSpatialStructure(aiNode* parent, const IfcProduct& el, Conversion
                 }
                 }
 
 
                 // move aggregate elements to a separate node since they are semantically different than elements that are just 'contained'
                 // move aggregate elements to a separate node since they are semantically different than elements that are just 'contained'
-                std::auto_ptr<aiNode> nd_aggr(new aiNode());
+                std::unique_ptr<aiNode> nd_aggr(new aiNode());
                 nd_aggr->mName.Set("$RelAggregates");
                 nd_aggr->mName.Set("$RelAggregates");
                 nd_aggr->mParent = nd.get();
                 nd_aggr->mParent = nd.get();
 
 

+ 2 - 2
code/IFCMaterial.cpp

@@ -154,7 +154,7 @@ unsigned int ProcessMaterials(uint64_t id, unsigned int prevMatId, ConversionDat
                             IFCImporter::LogWarn("ignoring surface side marker on IFC::IfcSurfaceStyle: " + side);
                             IFCImporter::LogWarn("ignoring surface side marker on IFC::IfcSurfaceStyle: " + side);
                         }
                         }
 
 
-                        std::auto_ptr<aiMaterial> mat(new aiMaterial());
+                        std::unique_ptr<aiMaterial> mat(new aiMaterial());
 
 
                         FillMaterial(mat.get(), surf, conv);
                         FillMaterial(mat.get(), surf, conv);
 
 
@@ -190,7 +190,7 @@ unsigned int ProcessMaterials(uint64_t id, unsigned int prevMatId, ConversionDat
     }
     }
 
 
     // we're here, yet - no default material with suitable color available. Generate one
     // we're here, yet - no default material with suitable color available. Generate one
-    std::auto_ptr<aiMaterial> mat(new aiMaterial());
+    std::unique_ptr<aiMaterial> mat(new aiMaterial());
     mat->AddProperty(&name,AI_MATKEY_NAME);
     mat->AddProperty(&name,AI_MATKEY_NAME);
 
 
     const aiColor4D col = aiColor4D( 0.6f, 0.6f, 0.6f, 1.0f); // aiColor4D( color.r, color.g, color.b, 1.0f);
     const aiColor4D col = aiColor4D( 0.6f, 0.6f, 0.6f, 1.0f); // aiColor4D( color.r, color.g, color.b, 1.0f);

+ 1 - 1
code/IFCUtil.cpp

@@ -75,7 +75,7 @@ aiMesh* TempMesh::ToMesh()
         return NULL;
         return NULL;
     }
     }
 
 
-    std::auto_ptr<aiMesh> mesh(new aiMesh());
+    std::unique_ptr<aiMesh> mesh(new aiMesh());
 
 
     // copy vertices
     // copy vertices
     mesh->mNumVertices = static_cast<unsigned int>(verts.size());
     mesh->mNumVertices = static_cast<unsigned int>(verts.size());

+ 1 - 1
code/STEPFile.h

@@ -509,7 +509,7 @@ namespace STEP {
 
 
         static Object* Construct(const STEP::DB& db, const EXPRESS::LIST& params) {
         static Object* Construct(const STEP::DB& db, const EXPRESS::LIST& params) {
             // make sure we don't leak if Fill() throws an exception
             // make sure we don't leak if Fill() throws an exception
-            std::auto_ptr<TDerived> impl(new TDerived());
+            std::unique_ptr<TDerived> impl(new TDerived());
 
 
             // GenericFill<T> is undefined so we need to have a specialization
             // GenericFill<T> is undefined so we need to have a specialization
             const size_t num_args = GenericFill<TDerived>(db,params,&*impl);
             const size_t num_args = GenericFill<TDerived>(db,params,&*impl);

+ 1 - 1
code/STEPFileReader.cpp

@@ -88,7 +88,7 @@ STEP::TypeError::TypeError (const std::string& s,uint64_t entity /* = ENTITY_NOT
 STEP::DB* STEP::ReadFileHeader(boost::shared_ptr<IOStream> stream)
 STEP::DB* STEP::ReadFileHeader(boost::shared_ptr<IOStream> stream)
 {
 {
     boost::shared_ptr<StreamReaderLE> reader = boost::shared_ptr<StreamReaderLE>(new StreamReaderLE(stream));
     boost::shared_ptr<StreamReaderLE> reader = boost::shared_ptr<StreamReaderLE>(new StreamReaderLE(stream));
-    std::auto_ptr<STEP::DB> db = std::auto_ptr<STEP::DB>(new STEP::DB(reader));
+    std::unique_ptr<STEP::DB> db = std::unique_ptr<STEP::DB>(new STEP::DB(reader));
 
 
     LineSplitter& splitter = db->GetSplitter();
     LineSplitter& splitter = db->GetSplitter();
     if (!splitter || *splitter != "ISO-10303-21;") {
     if (!splitter || *splitter != "ISO-10303-21;") {