Merge pull request #1 from kaidokert/master

Andrey Bushev · Andrey Bushev · commit c67e6988bc92 · 2016-04-27T00:26:28.000-04:00
Tiny fix for misnamed macro, add a compile-test for it
diff --git a/delegate.hpp b/delegate.hpp
@@ -154,7 +154,7 @@ using detail::Delegate;
 #undef CB_FORWARD
 
 #define __CB_DELEGATE_INIT(instance, func) decltype(CB::detail::create_delegate(func))::bind<func>(instance)
-#define __CB_DELEGATE_FF(func) decltype(CB::detail::create_delegate(func))::bind<func>()
+#define __CB_DELEGATE_INIT_FF(func) decltype(CB::detail::create_delegate(func))::bind<func>()
 #define CB_DELEGATE_INIT __CB_DELEGATE_INIT
 #define CB_DELEGATE_FF __CB_DELEGATE_INIT_FF
 
diff --git a/test/main.cpp b/test/main.cpp
@@ -60,8 +60,12 @@ int main(int argc, char **argv)
         printf("%d\n", b3(5));
 
     }
+    {
+        printf("\n");
+        E d = create_delegate_freefunction();
+        int val = 41;
+        printf("%d %d\n",d(val), val);
+    }
 
     return 0;
 }
-
-
diff --git a/test/routines.cpp b/test/routines.cpp
@@ -19,3 +19,7 @@ D create_delegate(Value &v)
     return d;
 }
 
+E create_delegate_freefunction() {
+    E d = CB_DELEGATE_FF(increment);
+    return d;
+}
diff --git a/test/routines.hpp b/test/routines.hpp
@@ -5,6 +5,7 @@
 using C = CB::StaticClosure<int (int), 64>;
 using C1 = CB::StaticClosure<int (int), 76>;
 using D = CB::Delegate<int (int)>;
+using E = CB::Delegate<int (int &)>;
 
 struct Value {
 
@@ -17,6 +18,11 @@ struct Value {
 
 };
 
+inline int increment(int &val) {
+    return val++;
+}
+
 C create_closure(int init, const char *text);
 C1 create_closure2(int init, const char *text);
 D create_delegate(Value &v);
+E create_delegate_freefunction();

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,12 @@ int main(int argc, char **argv)`
`60`	`60`	`printf("%d\n", b3(5));`
`61`	`61`
`62`	`62`	`}`
	`63`	`+ {`
	`64`	`+ printf("\n");`
	`65`	`+ E d = create_delegate_freefunction();`
	`66`	`+ int val = 41;`
	`67`	`+ printf("%d %d\n",d(val), val);`
	`68`	`+ }`
`63`	`69`
`64`	`70`	`return 0;`
`65`	`71`	`}`
`66`		`-`
`67`		`-`
Original file line number	Diff line number	Diff line change
`@@ -19,3 +19,7 @@ D create_delegate(Value &v)`
`19`	`19`	`return d;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+E create_delegate_freefunction() {`
	`23`	`+ E d = CB_DELEGATE_FF(increment);`
	`24`	`+ return d;`
	`25`	`+}`