patches/scim-01-ss11-patch.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 762 b7d5033f034b
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
762
b7d5033f034b 2008-01-04 Yong Sun <[email protected]>
yongsun
parents: 353
diff changeset
     1
--- scim-1.4.7.orig/src/scim_slot.h	2007-10-09 00:42:09.000000000 +0800
b7d5033f034b 2008-01-04 Yong Sun <[email protected]>
yongsun
parents: 353
diff changeset
     2
+++ scim-1.4.7/src/scim_slot.h	2008-01-04 15:13:42.158361775 +0800
353
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     3
@@ -149,7 +149,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     4
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     5
 template <typename T1, typename T2, typename R>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     6
 inline Slot0<R>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     7
-slot(T1* &object, R (T2::*function)())
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     8
+slot(T1* object, R (T2::*function)())
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     9
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    10
     return new MethodSlot0<T2, R>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    11
 }
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    12
@@ -291,7 +291,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    13
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    14
 template <typename T1, typename T2, typename R, typename P1>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    15
 inline Slot1<R, P1>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    16
-slot(T1* &object, R (T2::*function)(P1))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    17
+slot(T1* object, R (T2::*function)(P1))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    18
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    19
     return new MethodSlot1<T2, R, P1>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    20
 }
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    21
@@ -434,7 +434,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    22
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    23
 template <typename T1, typename T2, typename R, typename P1, typename P2>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    24
 inline Slot2<R, P1, P2>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    25
-slot(T1* &object, R (T2::*function)(P1, P2))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    26
+slot(T1* object, R (T2::*function)(P1, P2))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    27
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    28
     return new MethodSlot2<T2, R, P1, P2>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    29
 }
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    30
@@ -577,7 +577,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    31
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    32
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    33
 inline Slot3<R, P1, P2, P3>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    34
-slot(T1* &object, R (T2::*function)(P1, P2, P3))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    35
+slot(T1* object, R (T2::*function)(P1, P2, P3))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    36
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    37
     return new MethodSlot3<T2, R, P1, P2, P3>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    38
 }
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    39
@@ -720,7 +720,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    40
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    41
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    42
 inline Slot4<R, P1, P2, P3, P4>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    43
-slot(T1* &object, R (T2::*function)(P1, P2, P3, P4))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    44
+slot(T1* object, R (T2::*function)(P1, P2, P3, P4))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    45
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    46
     return new MethodSlot4<T2, R, P1, P2, P3, P4>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    47
 }
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    48
@@ -862,7 +862,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    49
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    50
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4, typename P5>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    51
 inline Slot5<R, P1, P2, P3, P4, P5>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    52
-slot(T1* &object, R (T2::*function)(P1, P2, P3, P4, P5))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    53
+slot(T1* object, R (T2::*function)(P1, P2, P3, P4, P5))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    54
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    55
     return new MethodSlot5<T2, R, P1, P2, P3, P4, P5>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    56
 }
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    57
@@ -1005,7 +1005,7 @@
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    58
 
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    59
 template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    60
 inline Slot6<R, P1, P2, P3, P4, P5, P6>*
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    61
-slot(T1* &object, R (T2::*function)(P1, P2, P3, P4, P5, P6))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    62
+slot(T1* object, R (T2::*function)(P1, P2, P3, P4, P5, P6))
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    63
 {
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    64
     return new MethodSlot6<T2, R, P1, P2, P3, P4, P5, P6>(object, function);
70b47e90db3f 2007-07-27 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    65
 }