move prov/generic2 into main tree, replace original generic

litmaj0r · May 4, 2016 · dc1ab5d · dc1ab5d
1 parent c275945
commit dc1ab5d
Show file tree

Hide file tree

Showing 29 changed files with 450 additions and 647 deletions.
diff --git a/VisualStudioBuild/_tos-databridge.vcxproj b/VisualStudioBuild/_tos-databridge.vcxproj
@@ -176,9 +176,9 @@
     <ClInclude Include="..\include\concurrency.hpp" />
     <ClInclude Include="..\include\containers.hpp" />
     <ClInclude Include="..\include\data_stream.hpp" />
+    <ClInclude Include="..\include\generic.hpp" />
     <ClInclude Include="..\include\ipc.hpp" />
     <ClInclude Include="..\include\exceptions.hpp" />
-    <ClInclude Include="..\include\generic.hpp" />
     <ClInclude Include="..\include\raw_data_block.hpp" />
     <ClInclude Include="..\include\tos_databridge.h" />
   </ItemGroup>

diff --git a/VisualStudioBuild/_tos-databridge.vcxproj.filters b/VisualStudioBuild/_tos-databridge.vcxproj.filters
@@ -44,9 +44,6 @@
     <ClInclude Include="..\include\data_stream.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\generic.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\raw_data_block.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -59,5 +56,8 @@
     <ClInclude Include="..\include\ipc.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\generic.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/VisualStudioBuild/tos-databridge.vcxproj b/VisualStudioBuild/tos-databridge.vcxproj
@@ -185,8 +185,8 @@
   <ItemGroup>
     <ClCompile Include="..\src\client_admin.cpp" />
     <ClCompile Include="..\src\client_out.cpp" />
-    <ClCompile Include="..\src\generic.cpp" />
     <ClCompile Include="..\src\client_get.cpp" />
+    <ClCompile Include="..\src\generic.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\data_stream.tpp">

diff --git a/VisualStudioBuild/tos-databridge.vcxproj.filters b/VisualStudioBuild/tos-databridge.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\generic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\client_admin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -27,6 +24,9 @@
     <ClCompile Include="..\src\client_out.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\generic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\data_stream.tpp" />

diff --git a/bin/Release/Win32/_tos-databridge-x86.dll b/bin/Release/Win32/_tos-databridge-x86.dll
diff --git a/bin/Release/Win32/_tos-databridge-x86.exp b/bin/Release/Win32/_tos-databridge-x86.exp
diff --git a/bin/Release/Win32/_tos-databridge-x86.lib b/bin/Release/Win32/_tos-databridge-x86.lib
diff --git a/bin/Release/Win32/tos-databridge-0.4-x86.dll b/bin/Release/Win32/tos-databridge-0.4-x86.dll
diff --git a/bin/Release/Win32/tos-databridge-0.4-x86.exp b/bin/Release/Win32/tos-databridge-0.4-x86.exp
diff --git a/bin/Release/Win32/tos-databridge-0.4-x86.lib b/bin/Release/Win32/tos-databridge-0.4-x86.lib
diff --git a/bin/Release/Win32/tos-databridge-engine-x86.exe b/bin/Release/Win32/tos-databridge-engine-x86.exe
diff --git a/bin/Release/Win32/tos-databridge-serv-x86.exe b/bin/Release/Win32/tos-databridge-serv-x86.exe
diff --git a/bin/Release/Win32/tos-databridge-shell-x86.exe b/bin/Release/Win32/tos-databridge-shell-x86.exe
diff --git a/bin/Release/x64/_tos-databridge-x64.dll b/bin/Release/x64/_tos-databridge-x64.dll
diff --git a/bin/Release/x64/_tos-databridge-x64.exp b/bin/Release/x64/_tos-databridge-x64.exp
diff --git a/bin/Release/x64/_tos-databridge-x64.lib b/bin/Release/x64/_tos-databridge-x64.lib
diff --git a/bin/Release/x64/tos-databridge-0.4-x64.dll b/bin/Release/x64/tos-databridge-0.4-x64.dll
diff --git a/bin/Release/x64/tos-databridge-0.4-x64.exp b/bin/Release/x64/tos-databridge-0.4-x64.exp
diff --git a/bin/Release/x64/tos-databridge-0.4-x64.lib b/bin/Release/x64/tos-databridge-0.4-x64.lib
diff --git a/bin/Release/x64/tos-databridge-engine-x64.exe b/bin/Release/x64/tos-databridge-engine-x64.exe
diff --git a/bin/Release/x64/tos-databridge-serv-x64.exe b/bin/Release/x64/tos-databridge-serv-x64.exe
diff --git a/bin/Release/x64/tos-databridge-shell-x64.exe b/bin/Release/x64/tos-databridge-shell-x64.exe