diff options
author | Max Danielsson <max@autious.net> | 2022-04-22 23:05:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-22 23:05:41 +0300 |
commit | 08da859107194d3d283c6b54565bffb656478a26 (patch) | |
tree | 1474308999ccff3e90f30be3334f34555188b071 | |
parent | 500b181b745575d2451875738c208b27c5a0d2e3 (diff) | |
parent | 9d9847f081dc20ec79564b2f53e27e62906862c8 (diff) |
Merge pull request #13 from EmpSurak/sc/s4997
Replace deprecated auto_ptr (S4997)
-rw-r--r-- | Source/Game/level.h | 2 | ||||
-rw-r--r-- | Source/Graphics/skeleton.h | 2 | ||||
-rw-r--r-- | Source/JSON/jsoncpp.cpp | 4 | ||||
-rw-r--r-- | Source/Objects/envobject.h | 2 | ||||
-rw-r--r-- | Source/Objects/hotspot.h | 2 | ||||
-rw-r--r-- | Source/Objects/movementobject.h | 6 | ||||
-rw-r--r-- | Source/Physics/bulletobject.h | 2 | ||||
-rw-r--r-- | Source/Sound/sound.h | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/Source/Game/level.h b/Source/Game/level.h index d57cb072..9a25e6f4 100644 --- a/Source/Game/level.h +++ b/Source/Game/level.h @@ -187,7 +187,7 @@ private: // vvv These are just here to avoid per-frame mallocs vvv CollisionPtrMap old_col_ptr_map; - std::auto_ptr<ASCollisions> as_collisions; + std::unique_ptr<ASCollisions> as_collisions; Path FindScript(const std::string& path); }; diff --git a/Source/Graphics/skeleton.h b/Source/Graphics/skeleton.h index 97b89009..be8fe738 100644 --- a/Source/Graphics/skeleton.h +++ b/Source/Graphics/skeleton.h @@ -99,7 +99,7 @@ class Skeleton { public: - std::auto_ptr<BulletWorld> col_bullet_world; + std::unique_ptr<BulletWorld> col_bullet_world; std::vector<int> parents; std::vector<PhysicsBone> physics_bones; std::vector<PhysicsJoint> physics_joints; diff --git a/Source/JSON/jsoncpp.cpp b/Source/JSON/jsoncpp.cpp index f6d3b92c..ae771078 100644 --- a/Source/JSON/jsoncpp.cpp +++ b/Source/JSON/jsoncpp.cpp @@ -236,7 +236,7 @@ static int stackDepth_g = 0; // see readValue() namespace Json { -typedef std::auto_ptr<CharReader> CharReaderPtr; +typedef std::unique_ptr<CharReader> CharReaderPtr; // Implementation of class Features // //////////////////////////////// @@ -3825,7 +3825,7 @@ Value& Path::make(Value& root) const { namespace Json { -typedef std::auto_ptr<StreamWriter> StreamWriterPtr; +typedef std::unique_ptr<StreamWriter> StreamWriterPtr; static bool containsControlCharacter(const char* str) { while (*str) { diff --git a/Source/Objects/envobject.h b/Source/Objects/envobject.h index 906d1bc5..2ad1ee4a 100644 --- a/Source/Objects/envobject.h +++ b/Source/Objects/envobject.h @@ -93,7 +93,7 @@ struct MaterialParticle; class EnvObject: public Object { public: float timestamp_for_sendoff = 0.0f; - std::auto_ptr<PlantComponent> plant_component_; + std::unique_ptr<PlantComponent> plant_component_; ObjectFileRef ofr; BulletObject* bullet_object_; diff --git a/Source/Objects/hotspot.h b/Source/Objects/hotspot.h index 5a20412d..003f5c93 100644 --- a/Source/Objects/hotspot.h +++ b/Source/Objects/hotspot.h @@ -59,7 +59,7 @@ public: virtual void NotifyDeleted(Object* o); virtual EntityType GetType() const { return _hotspot_object; } - std::auto_ptr<ASCollisions> as_collisions; + std::unique_ptr<ASCollisions> as_collisions; void Reset(); virtual void SetEnabled(bool val); diff --git a/Source/Objects/movementobject.h b/Source/Objects/movementobject.h index 243b94c8..530e5e99 100644 --- a/Source/Objects/movementobject.h +++ b/Source/Objects/movementobject.h @@ -130,7 +130,7 @@ public: std::string character_path; ReactionScriptGetter reaction_script_getter; CharacterScriptGetter character_script_getter; - std::auto_ptr<ASContext> as_context; + std::unique_ptr<ASContext> as_context; OGPalette palette; int connected_pathpoint_id; std::vector<ItemConnection> item_connection_vec; @@ -150,7 +150,7 @@ public: std::string nametag_string; vec3 nametag_last_position; - std::auto_ptr<ASCollisions> as_collisions; + std::unique_ptr<ASCollisions> as_collisions; ActorFileRef actor_file_ref; std::set<SoundGroupRef> touched_surface_refs; @@ -248,7 +248,7 @@ public: std::string GetTeamString(); void StartPoseAnimation(std::string path); private: - std::auto_ptr<RiggedObject> rigged_object_; + std::unique_ptr<RiggedObject> rigged_object_; std::string current_control_script_path; std::string actor_script_path; BulletObject* char_sphere; diff --git a/Source/Physics/bulletobject.h b/Source/Physics/bulletobject.h index d3d60e8f..3c101ef0 100644 --- a/Source/Physics/bulletobject.h +++ b/Source/Physics/bulletobject.h @@ -56,7 +56,7 @@ public: std::vector<mat4> transform_history; btRigidBody *body; SharedShapePtr shape; - std::auto_ptr<ShapeDisposalData> shape_disposal_data; + std::unique_ptr<ShapeDisposalData> shape_disposal_data; bool visible; vec3 com_offset; short collision_group; diff --git a/Source/Sound/sound.h b/Source/Sound/sound.h index 8b425d4b..22177a07 100644 --- a/Source/Sound/sound.h +++ b/Source/Sound/sound.h @@ -145,7 +145,7 @@ class Sound { Soundtrack m_soundtrack; - typedef std::auto_ptr<ambientSound> ambient_ptr; + typedef std::unique_ptr<ambientSound> ambient_ptr; ambient_ptr m_air_whoosh_sound; int whoosh_active_countdown; //Kill whoosh if not updated in given frameperiod. |