Merge lp:~chasedouglas/geis/subscription-flags into lp:geis

[Chase Douglas]

Typedef GeisSubscriptionFlags to an int instead of an enum. When attempting to set a flags variable with multiple flags OR'd together, the result is no longer equivalent to any specific value of the enum. This causes build errors on variable assignment when building withg++.

[Daniel d'Andrada (dandrader)]

Looks good to me.

review: Approve

[Stephen M. Webb (bregma)]

Given that the original code has GeisSubscriptionFlags as a typedef of type int (see ISO/IEC 9899:2011
6.7.2.2(3)), this change is a no-op except for being less idiomatic C.

[Stephen M. Webb (bregma)]

I see this fixes a GCC -fpermissive warning when built using C++. I will approve on that basis.

review: Approve

=== modified file 'include/geis/geis.h'
--- include/geis/geis.h	2012-04-19 13:05:29 +0000
+++ include/geis/geis.h	2012-04-20 19:19:43 +0000
@@ -1825,12 +1825,13 @@
  * If this flag is not set, a new gesture will be identified for each change in
  * gesture class.
  */
-typedef enum GeisSubscriptionFlags
+enum
 {
   GEIS_SUBSCRIPTION_NONE = 0x0000,
   GEIS_SUBSCRIPTION_GRAB = 0x0001,
   GEIS_SUBSCRIPTION_CONT = 0x0002
-} GeisSubscriptionFlags;
+};
+typedef int GeisSubscriptionFlags;
 
 /**
  * Creates a new subscription.