diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-02-28 01:24:18 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-02-28 01:24:18 +0000 |
| commit | 7a70e75656d31428c9bbbd51fbf1ca920e577ed1 (patch) | |
| tree | fcaed03c9b094e8b37d8d787f6695e8306031a3c /assetFactory | |
| parent | Support for named colours in assets (diff) | |
| download | ilt-7a70e75656d31428c9bbbd51fbf1ca920e577ed1.tar.bz2 ilt-7a70e75656d31428c9bbbd51fbf1ca920e577ed1.tar.xz ilt-7a70e75656d31428c9bbbd51fbf1ca920e577ed1.zip | |
Remove to specify if the Selection pointer type is shared or not
Inferred based on whether the pointer is copyable or not.
Diffstat (limited to 'assetFactory')
| -rw-r--r-- | assetFactory/assetFactory.h | 4 | ||||
| -rw-r--r-- | assetFactory/faceController.h | 2 | ||||
| -rw-r--r-- | assetFactory/factoryMesh.h | 2 | ||||
| -rw-r--r-- | assetFactory/object.h | 2 | ||||
| -rw-r--r-- | assetFactory/use.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/assetFactory/assetFactory.h b/assetFactory/assetFactory.h index a68b460..42082eb 100644 --- a/assetFactory/assetFactory.h +++ b/assetFactory/assetFactory.h @@ -14,7 +14,7 @@ public: FactoryMesh::Collection meshes; private: - friend Persistence::SelectionPtrBase<std::shared_ptr<Asset>, true>; + friend Persistence::SelectionPtrBase<std::shared_ptr<Asset>>; bool persist(Persistence::PersistenceStore & store) override; }; @@ -36,6 +36,6 @@ public: static void normalizeColourName(std::string &); private: - friend Persistence::SelectionPtrBase<std::shared_ptr<AssetFactory>, true>; + friend Persistence::SelectionPtrBase<std::shared_ptr<AssetFactory>>; bool persist(Persistence::PersistenceStore & store) override; }; diff --git a/assetFactory/faceController.h b/assetFactory/faceController.h index 0618388..10a226a 100644 --- a/assetFactory/faceController.h +++ b/assetFactory/faceController.h @@ -21,7 +21,7 @@ public: FaceControllers faceControllers; private: - friend Persistence::SelectionPtrBase<std::unique_ptr<FaceController>, false>; + friend Persistence::SelectionPtrBase<std::unique_ptr<FaceController>>; bool persist(Persistence::PersistenceStore & store) override; std::string getId() const override diff --git a/assetFactory/factoryMesh.h b/assetFactory/factoryMesh.h index 4b6d3e5..bbeb870 100644 --- a/assetFactory/factoryMesh.h +++ b/assetFactory/factoryMesh.h @@ -13,6 +13,6 @@ public: Use::Collection uses; private: - friend Persistence::SelectionPtrBase<std::shared_ptr<FactoryMesh>, true>; + friend Persistence::SelectionPtrBase<std::shared_ptr<FactoryMesh>>; bool persist(Persistence::PersistenceStore & store) override; }; diff --git a/assetFactory/object.h b/assetFactory/object.h index 1069f66..f3726c7 100644 --- a/assetFactory/object.h +++ b/assetFactory/object.h @@ -16,7 +16,7 @@ public: std::string id; private: - friend Persistence::SelectionPtrBase<std::shared_ptr<Object>, true>; + friend Persistence::SelectionPtrBase<std::shared_ptr<Object>>; bool persist(Persistence::PersistenceStore & store) override; std::string getId() const override diff --git a/assetFactory/use.h b/assetFactory/use.h index 5b61eca..5e4c35f 100644 --- a/assetFactory/use.h +++ b/assetFactory/use.h @@ -17,7 +17,7 @@ public: FaceControllers faceControllers; private: - friend Persistence::SelectionPtrBase<std::shared_ptr<Use>, true>; + friend Persistence::SelectionPtrBase<std::shared_ptr<Use>>; bool persist(Persistence::PersistenceStore & store) override; std::string getId() const override |