Moved ReactiveDomain.h back ...

schlangster · schlangster · commit d7964db09605 · 2014-03-24T22:38:09.000+01:00
diff --git a/include/react/ReactiveDomain.h b/include/react/ReactiveDomain.h
@@ -125,7 +125,7 @@ class DomainBase
 		typename V,
 		typename S = std::decay<V>::type,
 		class = std::enable_if<
-			!IsSignalT<D,S>::value>::type
+			!IsSignal<D,S>::value>::type
 	>
 	static auto MakeVar(V&& value)
 		-> VarSignal<S>
@@ -142,7 +142,7 @@ class DomainBase
 		typename S = std::decay<V>::type,
 		typename TInner = S::ValueT,
 		class = std::enable_if<
-			IsSignalT<D,S>::value>::type
+			IsSignal<D,S>::value>::type
 	>
 	static auto MakeVar(V&& value)
 		-> VarSignal<Signal<TInner>>
diff --git a/project/msvc/CppReact.vcxproj b/project/msvc/CppReact.vcxproj
@@ -77,7 +77,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\react\common\ReactiveDomain.h" />
     <ClInclude Include="..\..\include\react\graph\ReactorNodes.h" />
     <ClInclude Include="..\..\include\react\Options.h" />
     <ClInclude Include="..\..\include\react\common\Concurrency.h" />
@@ -111,6 +110,7 @@
     <ClInclude Include="..\..\include\react\propagation\TopoSortEngine.h" />
     <ClInclude Include="..\..\include\react\propagation\TopoSortO1Engine.h" />
     <ClInclude Include="..\..\include\react\ReactiveBase.h" />
+    <ClInclude Include="..\..\include\react\ReactiveDomain.h" />
     <ClInclude Include="..\..\include\react\ReactiveObject.h" />
     <ClInclude Include="..\..\include\react\Reactor.h" />
     <ClInclude Include="..\..\include\react\Signal.h" />
diff --git a/project/msvc/CppReact.vcxproj.filters b/project/msvc/CppReact.vcxproj.filters
@@ -150,8 +150,8 @@
     <ClInclude Include="..\..\include\react\graph\ReactorNodes.h">
       <Filter>Header Files\graph</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\react\common\ReactiveDomain.h">
-      <Filter>Header Files\common</Filter>
+    <ClInclude Include="..\..\include\react\ReactiveDomain.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
