Fix a bug in assisted injection, that caused a compilation error when…

… more than 1 argument to a function was assisted and they had different types.

Fixes #12.

include/fruit/impl/meta/component.h

@@ -228,7 +228,7 @@ struct RemoveNonAssisted {
 
       template <typename CurrentResult, typename T>
       struct apply<CurrentResult, Type<Assisted<T>>> {
-        using type = PushFront(CurrentResult, Type<T>);
+        using type = PushBack(CurrentResult, Type<T>);
       };
     };
 

tests/CMakeLists.txt

@@ -118,6 +118,7 @@ register_constructor_not_existing.cpp
 register_constructor_not_existing_with_annotation.cpp
 register_constructor_with_annotation.cpp
 register_factory_autoinject.cpp
+register_factory_autoinject2.cpp
 register_factory_autoinject_from_provider.cpp
 register_factory_autoinject_from_provider_with_annotation.cpp
 register_factory_autoinject_with_binding.cpp

tests/register_factory_autoinject2.cpp

@@ -0,0 +1,51 @@
+// expect-success
+/*
+ * Copyright 2014 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <fruit/fruit.h>
+#include "test_macros.h"
+
+using fruit::Component;
+using fruit::Injector;
+using fruit::Assisted;
+using fruit::createComponent;
+
+struct Foo {
+  Foo(int x, float y) {
+    (void)x;
+    (void)y;
+  }
+};
+
+using FooFactory = std::function<Foo(int, float)>;
+
+fruit::Component<FooFactory> getComponent() {
+  return fruit::createComponent()
+      .registerFactory<Foo(fruit::Assisted<int>, fruit::Assisted<float>)>(
+          [](int x, float y) {
+            return Foo(x, y);
+          });
+}
+
+
+int main() {
+  Injector<FooFactory> injector(getComponent());
+  FooFactory fooFactory(injector);
+  Foo foo = fooFactory(1, 2.3);
+  (void)foo;
+
+  return 0;
+}