[Bf-blender-cvs] [34f8a87] alembic_pointcache: Use a dummy struct type PTCArchive instead of a plain void pointer.
Lukas Tönne
noreply at git.blender.org
Thu Oct 16 16:52:39 CEST 2014
Commit: 34f8a87ca5b5678d36d12cbf0e4ae016676be23d
Author: Lukas Tönne
Date: Mon Oct 7 13:26:05 2013 +0200
Branches: alembic_pointcache
https://developer.blender.org/rB34f8a87ca5b5678d36d12cbf0e4ae016676be23d
Use a dummy struct type PTCArchive instead of a plain void pointer.
===================================================================
M source/blender/makesdna/DNA_object_force.h
M source/blender/pointcache/PTC_api.cpp
===================================================================
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index e9fdb68..dbf15fd 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -207,7 +207,7 @@ typedef struct PointCache {
struct PTCacheEdit *edit;
void (*free_edit)(struct PTCacheEdit *edit); /* free callback */
- void *archive;
+ struct PTCArchive *archive;
} PointCache;
typedef struct SBVertex {
diff --git a/source/blender/pointcache/PTC_api.cpp b/source/blender/pointcache/PTC_api.cpp
index d073b0d..379687a 100644
--- a/source/blender/pointcache/PTC_api.cpp
+++ b/source/blender/pointcache/PTC_api.cpp
@@ -21,18 +21,20 @@
extern "C" {
-void *PTC_archive_create(const char *filename)
+typedef struct PTCArchive PTCArchive;
+
+PTCArchive *PTC_archive_create(const char *filename)
{
OArchive *archive = new OArchive(Alembic::AbcCoreHDF5::WriteArchive(),
std::string(filename),
ErrorHandler::kThrowPolicy);
- return archive;
+ return (PTCArchive *)archive;
}
-void PTC_archive_free(void *_archive)
+void PTC_archive_free(PTCArchive *_archive)
{
- OArchive *archive = static_cast<OArchive *>(_archive);
+ OArchive *archive = (OArchive *)_archive;
delete archive;
}
More information about the Bf-blender-cvs
mailing list