Nux

Merge lp:~hikiko/nux/nux.virt-destructors into lp:nux

Proposed by Eleni Maria Stea
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 827
Merged at revision: 827
Proposed branch: lp:~hikiko/nux/nux.virt-destructors
Merge into: lp:nux
Diff against target: 65 lines (+6/-2)
4 files modified
NuxCore/AnimationController.h (+2/-2)
NuxCore/Property.h (+1/-0)
NuxGraphics/GLResourceManager.h (+1/-0)
tests/gtest-nux-gesturebroker.cpp (+2/-0)
To merge this branch: bzr merge lp:~hikiko/nux/nux.virt-destructors
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+193926@code.launchpad.net

Commit message

added virtual destructors where missing (fixing static analysis errors)

Description of the change

added virtual destructors where missing (fixing static analysis errors)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Actually this break the ABI for nux, but i also heard this was talked about...so for now just moving to needs fixing :)

review: Needs Fixing
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Merging this first, then nux perf branch which will handle the ABI break

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxCore/AnimationController.h'
2--- NuxCore/AnimationController.h 2012-11-05 21:31:06 +0000
3+++ NuxCore/AnimationController.h 2013-11-05 13:37:55 +0000
4@@ -53,7 +53,7 @@
5 static Controller* Instance();
6
7 Controller();
8- ~Controller();
9+ virtual ~Controller();
10
11 virtual void AddAnimation(Animation* animation) = 0;
12 virtual void RemoveAnimation(Animation* animation) = 0;
13@@ -74,7 +74,7 @@
14 {
15 public:
16 AnimationController(TickSource& tick_source);
17- ~AnimationController();
18+ virtual ~AnimationController();
19
20 // tick is expected to be ever increasing
21 virtual void OnTick(long long tick);
22
23=== modified file 'NuxCore/Property.h'
24--- NuxCore/Property.h 2013-07-18 17:27:55 +0000
25+++ NuxCore/Property.h 2013-11-05 13:37:55 +0000
26@@ -192,6 +192,7 @@
27 class PropertyBase
28 {
29 public:
30+ virtual ~PropertyBase() {}
31 virtual bool SetValue(std::string const& serialized_form) = 0;
32 virtual std::string GetSerializedValue() const = 0;
33 };
34
35=== modified file 'NuxGraphics/GLResourceManager.h'
36--- NuxGraphics/GLResourceManager.h 2012-09-26 06:44:12 +0000
37+++ NuxGraphics/GLResourceManager.h 2013-11-05 13:37:55 +0000
38@@ -165,6 +165,7 @@
39 NResourceFactory(NObjectType *Type)
40 : m_ResourceType(Type)
41 {}
42+ virtual ~NResourceFactory() {}
43
44 // Returns the resource type for this factory
45 const NObjectType &Type() const
46
47=== modified file 'tests/gtest-nux-gesturebroker.cpp'
48--- tests/gtest-nux-gesturebroker.cpp 2012-12-05 08:40:25 +0000
49+++ tests/gtest-nux-gesturebroker.cpp 2013-11-05 13:37:55 +0000
50@@ -29,6 +29,7 @@
51 {
52 public:
53 SimpleTarget(int id) : id(id) {}
54+ virtual ~SimpleTarget() {}
55 virtual GestureDeliveryRequest GestureEvent(const nux::GestureEvent &/* event */)
56 {
57 return GestureDeliveryRequest::NONE;
58@@ -45,6 +46,7 @@
59 class SimpleGestureBroker : public nux::GestureBroker
60 {
61 public:
62+ virtual ~SimpleGestureBroker() {}
63 std::vector<ShPtGestureTarget> targets_to_be_found;
64
65 private:

Subscribers

People subscribed via source and target branches