Merge lp:~alan-griffiths/compiz-core/fix-option into lp:compiz-core/0.9.5

[Alan Griffiths]

Match the comment and interface to the implementation

[Daniel van Vugt (vanvugt)]

Looks good, builds perfectly.

However the prototype change affects the ABI so technically you also need to increment CORE_ABIVERSION (include/core/abiversion.h). Maybe I'm being too pedantic, but once 0.9.7 is released it will be critical to do this...

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> Looks good, builds perfectly.
>
> However the prototype change affects the ABI so technically you also need to
> increment CORE_ABIVERSION (include/core/abiversion.h). Maybe I'm being too
> pedantic, but once 0.9.7 is released it will be critical to do this...

Hmm. Did the prototype change I reverted bump the ABI version? Or get out into the wild?

(Anyway, changing any template implementation will change the ABI - so not just prototype changes need to be considered).

[Daniel van Vugt (vanvugt)]

I don't think it's in the wild. Just pointing it out for future reference...

review: Approve

=== modified file 'include/core/option.h'
--- include/core/option.h	2012-01-24 15:22:49 +0000
+++ include/core/option.h	2012-01-24 18:08:25 +0000
@@ -118,11 +118,8 @@
 		    mValue = t;
 		}
 
-		/* In order to be exception safe, this MUST
-		 * return a copy. Prefer to use a specific
-		 * member instead */
 		template<typename T>
-		const T & get (const T & defaultValue = T ()) const
+		const T & get () const
 		{
 		    try
 		    {
@@ -218,7 +215,7 @@
 	 */
 	class Class {
 	    public:
-		virtual ~Class() {};
+		virtual ~Class() {}
 		virtual Vector & getOptions () = 0;
 
 		virtual CompOption * getOption (const CompString &name);