Force some c'tors and d'tors to be emitted in the library

Forward declaring class A and having a RefPtr to it in class B causes
trouble if B's constructor or destructor is synthesized at a location
where A's definition is not visible.

diff --git a/source/animation.cpp b/source/animation.cpp
index 8135cb5995a406e5f9b722f5ca242b3c60eecb96..255e63cc8102128299076d345cb99dd8904ca6ed 100644 (file)
--- a/source/animation.cpp
+++ b/source/animation.cpp
@@ -17,6 +17,10 @@ Animation::Animation():
        looping(false)
 { }
 
+// Avoid synthesizing ~RefPtr in files including animation.h
+Animation::~Animation()
+{ }
+
 void Animation::set_armature(const Armature &a)
 {
        armature = &a;

diff --git a/source/animation.h b/source/animation.h
index 6b890ea369811d58ee7ae1aae42046dfef6cf173..58a76583392270e5f1c0dd7a348d0fe10cff23d7 100644 (file)
--- a/source/animation.h
+++ b/source/animation.h
@@ -100,6 +100,7 @@ private:
 
 public:
        Animation();
+       ~Animation();
 
        void set_armature(const Armature &);
        const Armature *get_armature() const { return armature; }

diff --git a/source/font.cpp b/source/font.cpp
index 53e3bd6261c0b11bfdbefc0e46a66adde4054d40..abfe631ef82dae0336bfb49f631023197c7d1b26 100644 (file)
--- a/source/font.cpp
+++ b/source/font.cpp
@@ -18,6 +18,10 @@ Font::Font():
        descent(0)
 { }
 
+// Avoid synthesizing ~RefPtr in files including font.h
+Font::~Font()
+{ }
+
 void Font::set_texture(const Texture2D &t)
 {
        texture = &t;

diff --git a/source/font.h b/source/font.h
index 6f8f35ff1db4be61fc52af060e1daade7ae73496..fe5a9b34d2355b386e2f891be38e2b71df48ff4c 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -58,6 +58,7 @@ private:
 
 public:
        Font();
+       ~Font();
 
        void set_texture(const Texture2D &);
        const Texture2D &get_texture() const;

diff --git a/source/keyframe.cpp b/source/keyframe.cpp
index e0d35ad80c7546a74f00754657a283a5e4583520..8e0d79044483f0fac6ba52c64476adb344e5b090 100644 (file)
--- a/source/keyframe.cpp
+++ b/source/keyframe.cpp
@@ -7,6 +7,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+// Avoid synthesizing RefPtr c'tor and d'tor in files including keyframe.h
+KeyFrame::KeyFrame()
+{ }
+
+KeyFrame::~KeyFrame()
+{ }
+
 void KeyFrame::set_matrix(const Matrix &m)
 {
        matrix = m;

diff --git a/source/keyframe.h b/source/keyframe.h
index ccfbda9a4f0cdf3dd2107f7e60ed028dd77f0021..6a8c5a447e60ab8c5f0575f47854e9019e145090 100644 (file)
--- a/source/keyframe.h
+++ b/source/keyframe.h
@@ -37,6 +37,9 @@ private:
        RefPtr<const Pose> pose;
 
 public:
+       KeyFrame();
+       ~KeyFrame();
+
        void set_matrix(const Matrix &);
        void set_pose(const Pose &);
        const Matrix &get_matrix() const { return matrix; }

diff --git a/source/object.cpp b/source/object.cpp
index ab7afc1480aaf272589df76a6dbe31ac732dd084..769996834bd89692f1be7496e6c2d1a411b0d3b6 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -25,9 +25,9 @@ Object::Object(const Mesh *m, const Technique *t)
        set_technique(t);
 }
 
+// Avoid synthesizing ~RefPtr in files including object.h
 Object::~Object()
-{
-}
+{ }
 
 void Object::set_mesh(unsigned i, const Mesh *m)
 {