minor vcxproj adjust for directory changes

4 files changed, 38 insertions, 35 deletions

diff --git a/dbtests/test.vcxproj b/dbtests/test.vcxproj
index 473b9108f93..37088cf8364 100644
--- a/dbtests/test.vcxproj
+++ b/dbtests/test.vcxproj
@@ -537,6 +537,7 @@
     <ClCompile Include="..\s\d_util.cpp" />

     <ClCompile Include="..\s\shardconnection.cpp" />

     <ClCompile Include="..\util\concurrency\task.cpp" />

+    <ClCompile Include="..\util\concurrency\thread_pool.cpp" />

     <ClCompile Include="..\util\concurrency\vars.cpp" />

     <ClCompile Include="..\util\mmap_win.cpp" />

     <ClCompile Include="..\db\namespace.cpp" />

@@ -581,7 +582,6 @@
     <ClCompile Include="..\util\ntservice.cpp" />

     <ClCompile Include="..\util\processinfo_win32.cpp" />

     <ClCompile Include="..\util\sock.cpp" />

-    <ClCompile Include="..\util\thread_pool.cpp" />

     <ClCompile Include="..\util\util.cpp" />

     <ClCompile Include="..\s\d_logic.cpp" />

     <ClCompile Include="..\scripting\engine.cpp" />

diff --git a/dbtests/test.vcxproj.filters b/dbtests/test.vcxproj.filters
index bee56e187d6..de2c48b29da 100755
--- a/dbtests/test.vcxproj.filters
+++ b/dbtests/test.vcxproj.filters
@@ -50,6 +50,9 @@
     <Filter Include="util\concurrency">

       <UniqueIdentifier>{d499fdba-b256-4b12-af20-cdd1ae1addff}</UniqueIdentifier>

     </Filter>

+    <Filter Include="util\h">

+      <UniqueIdentifier>{353b6f01-1cab-4156-a576-bc75ab204776}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\boostw\boost_1_34_1\boost\config\auto_link.hpp">

@@ -184,56 +187,56 @@
     <ClInclude Include="..\db\security.h">

       <Filter>db\h</Filter>

     </ClInclude>

+    <ClInclude Include="..\db\btree.h">

+      <Filter>btree related</Filter>

+    </ClInclude>

+    <ClInclude Include="..\util\concurrency\list.h">

+      <Filter>util\concurrency</Filter>

+    </ClInclude>

+    <ClInclude Include="..\util\concurrency\value.h">

+      <Filter>util\concurrency</Filter>

+    </ClInclude>

+    <ClInclude Include="..\util\concurrency\task.h">

+      <Filter>util\concurrency</Filter>

+    </ClInclude>

     <ClInclude Include="..\util\builder.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

+    </ClInclude>

+    <ClInclude Include="..\util\unittest.h">

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\file.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\goodies.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\hashtab.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\db\lasterror.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\log.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\lruishmap.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\md5.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\md5.hpp">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\miniwebserver.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\mmap.h">

-      <Filter>util</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

     <ClInclude Include="..\util\sock.h">

-      <Filter>util</Filter>

-    </ClInclude>

-    <ClInclude Include="..\util\unittest.h">

-      <Filter>util</Filter>

-    </ClInclude>

-    <ClInclude Include="..\db\btree.h">

-      <Filter>btree related</Filter>

-    </ClInclude>

-    <ClInclude Include="..\util\concurrency\list.h">

-      <Filter>util\concurrency</Filter>

-    </ClInclude>

-    <ClInclude Include="..\util\concurrency\value.h">

-      <Filter>util\concurrency</Filter>

-    </ClInclude>

-    <ClInclude Include="..\util\concurrency\task.h">

-      <Filter>util\concurrency</Filter>

+      <Filter>util\h</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

@@ -499,9 +502,6 @@
     <ClCompile Include="..\util\sock.cpp">

       <Filter>util\cpp</Filter>

     </ClCompile>

-    <ClCompile Include="..\util\thread_pool.cpp">

-      <Filter>util\cpp</Filter>

-    </ClCompile>

     <ClCompile Include="..\util\util.cpp">

       <Filter>util\cpp</Filter>

     </ClCompile>

@@ -628,6 +628,9 @@
     <ClCompile Include="..\s\d_util.cpp">

       <Filter>shard</Filter>

     </ClCompile>

+    <ClCompile Include="..\util\concurrency\thread_pool.cpp">

+      <Filter>util\concurrency</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\SConstruct">

diff --git a/s/dbgrid.vcxproj b/s/dbgrid.vcxproj
index 6ae0439eb80..d8271ea984d 100644
--- a/s/dbgrid.vcxproj
+++ b/s/dbgrid.vcxproj
@@ -184,6 +184,7 @@
   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="..\client\dbclientcursor.cpp" />

+    <ClCompile Include="..\util\concurrency\thread_pool.cpp" />

     <ClCompile Include="..\util\concurrency\vars.cpp" />

     <ClCompile Include="balance.cpp" />

     <ClCompile Include="chunk.cpp" />

@@ -500,7 +501,6 @@
     <ClCompile Include="..\util\processinfo_win32.cpp" />

     <ClCompile Include="..\util\sock.cpp" />

     <ClCompile Include="..\client\syncclusterconnection.cpp" />

-    <ClCompile Include="..\util\thread_pool.cpp" />

     <ClCompile Include="..\util\util.cpp" />

   </ItemGroup>

   <ItemGroup>

diff --git a/s/dbgrid.vcxproj.filters b/s/dbgrid.vcxproj.filters
index 9f031739263..cdee31b5998 100755
--- a/s/dbgrid.vcxproj.filters
+++ b/s/dbgrid.vcxproj.filters
@@ -246,9 +246,6 @@
     <ClCompile Include="..\client\syncclusterconnection.cpp">

       <Filter>Shared Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\util\thread_pool.cpp">

-      <Filter>Shared Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="..\util\util.cpp">

       <Filter>Shared Source Files</Filter>

     </ClCompile>

@@ -261,6 +258,9 @@
     <ClCompile Include="..\util\concurrency\vars.cpp">

       <Filter>Shared Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\util\concurrency\thread_pool.cpp">

+      <Filter>Shared Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="gridconfig.h">