Fix Visual Studio build & Windows warnings

Add timer.cpp to projects, organize mongos filters a little better, be consistent in struct/class usage to prevent warnings on Windows.
mongodb · Apr 24, 2012 · 6797ff9 · 6797ff9
1 parent 31bdfd7
commit 6797ff9
Show file tree

Hide file tree

Showing 9 changed files with 407 additions and 351 deletions.
diff --git a/src/mongo/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
@@ -13,7 +13,7 @@
 namespace mongo {
 
     class WrapperForRWLock;
-    struct LockState;
+    class LockState;
 
     class Lock : boost::noncopyable { 
     public:

diff --git a/src/mongo/db/db.vcxproj b/src/mongo/db/db.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -1218,6 +1218,7 @@
     <ClCompile Include="..\util\stringutils.cpp" />
     <ClCompile Include="..\util\systeminfo_win32.cpp" />
     <ClCompile Include="..\util\text.cpp" />
+    <ClCompile Include="..\util\timer.cpp" />
     <ClCompile Include="..\util\trace.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
@@ -1332,6 +1333,8 @@
     <ClInclude Include="..\util\progress_meter.h" />
     <ClInclude Include="..\util\concurrency\remap_lock.h" />
     <ClInclude Include="..\util\stacktrace.h" />
+    <ClInclude Include="..\util\timer-win32-inl.h" />
+    <ClInclude Include="..\util\timer.h" />
     <ClInclude Include="explain.h" />
     <ClInclude Include="index_insertion_continuation.h" />
     <ClInclude Include="lockstat.h" />

diff --git a/src/mongo/db/db.vcxproj.filters b/src/mongo/db/db.vcxproj.filters
@@ -472,6 +472,7 @@
     <ClCompile Include="commands\fsync.cpp">
       <Filter>db\commands</Filter>
     </ClCompile>
+    <ClCompile Include="..\util\timer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\distlock.h" />
@@ -770,6 +771,8 @@
       <Filter>db</Filter>
     </ClInclude>
     <ClInclude Include="..\util\stacktrace.h" />
+    <ClInclude Include="..\util\timer.h" />
+    <ClInclude Include="..\util\timer-win32-inl.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\jstests\dur\dur1.js" />

diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
@@ -510,6 +510,7 @@
     <ClInclude Include="..\util\mongoutils\hash.h" />
     <ClInclude Include="..\util\sock.h" />
     <ClInclude Include="..\util\stacktrace.h" />
+    <ClInclude Include="..\util\timer.h" />
     <ClInclude Include="..\util\unittest.h" />
     <ClInclude Include="framework.h" />
   </ItemGroup>
@@ -1493,6 +1494,7 @@
     </ClCompile>
     <ClCompile Include="..\util\stringutils.cpp" />
     <ClCompile Include="..\util\text.cpp" />
+    <ClCompile Include="..\util\timer.cpp" />
     <ClCompile Include="..\util\util.cpp" />
     <ClCompile Include="..\s\d_logic.cpp" />
     <ClCompile Include="..\scripting\engine.cpp" />

diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
@@ -68,6 +68,9 @@
     <Filter Include="db\commands">
       <UniqueIdentifier>{5b101eed-4c14-4a1a-864d-70fbaf17aac3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="util\mongoutils">
+      <UniqueIdentifier>{5bb09aa7-fce3-4573-8682-0bb42a4261a5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\boostw\boost_1_34_1\boost\config\auto_link.hpp">
@@ -202,9 +205,6 @@
     <ClInclude Include="..\util\hashtab.h">
       <Filter>util\h</Filter>
     </ClInclude>
-    <ClInclude Include="..\db\lasterror.h">
-      <Filter>util\h</Filter>
-    </ClInclude>
     <ClInclude Include="..\util\log.h">
       <Filter>util\h</Filter>
     </ClInclude>
@@ -241,12 +241,6 @@
     <ClInclude Include="..\db\durop.h">
       <Filter>dur</Filter>
     </ClInclude>
-    <ClInclude Include="..\util\mongoutils\hash.h">
-      <Filter>util\h</Filter>
-    </ClInclude>
-    <ClInclude Include="..\util\checksum.h">
-      <Filter>util</Filter>
-    </ClInclude>
     <ClInclude Include="..\bson\bson.h">
       <Filter>bson</Filter>
     </ClInclude>
@@ -364,6 +358,18 @@
     <ClInclude Include="..\util\stacktrace.h">
       <Filter>util\h</Filter>
     </ClInclude>
+    <ClInclude Include="..\util\checksum.h">
+      <Filter>util\h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\util\mongoutils\hash.h">
+      <Filter>util\mongoutils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\db\lasterror.h">
+      <Filter>db\h</Filter>
+    </ClInclude>
+    <ClInclude Include="..\util\timer.h">
+      <Filter>util\h</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\..\..\js\js32d.lib">
@@ -734,12 +740,6 @@
     <ClCompile Include="..\db\dbcommands_generic.cpp">
       <Filter>db\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\util\alignedbuilder.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
-    <ClCompile Include="..\util\concurrency\synchronization.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
     <ClCompile Include="..\db\dur_commitjob.cpp">
       <Filter>dur</Filter>
     </ClCompile>
@@ -764,9 +764,6 @@
     <ClCompile Include="..\db\dbcommands_admin.cpp">
       <Filter>db\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\util\ramlog.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
     <ClCompile Include="..\db\key.cpp">
       <Filter>db\cpp</Filter>
     </ClCompile>
@@ -1061,21 +1058,33 @@
     <ClCompile Include="..\db\namespace_details.cpp">
       <Filter>db\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\util\debug_util.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
     <ClCompile Include="..\unittest\unittest.cpp">
       <Filter>db\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\util\startup_test.cpp">
-      <Filter>util</Filter>
-    </ClCompile>
     <ClCompile Include="..\util\stacktrace.cpp">
       <Filter>util\cpp</Filter>
     </ClCompile>
     <ClCompile Include="..\db\commands\fsync.cpp">
       <Filter>db\commands</Filter>
     </ClCompile>
+    <ClCompile Include="..\util\timer.cpp">
+      <Filter>util\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util\alignedbuilder.cpp">
+      <Filter>util\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util\debug_util.cpp">
+      <Filter>util\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util\ramlog.cpp">
+      <Filter>util\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util\startup_test.cpp">
+      <Filter>util\cpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\util\concurrency\synchronization.cpp">
+      <Filter>util\concurrency</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\SConstruct">

diff --git a/src/mongo/s/dbgrid.vcxproj b/src/mongo/s/dbgrid.vcxproj
@@ -805,6 +805,7 @@
     <ClCompile Include="..\util\stringutils.cpp" />
     <ClCompile Include="..\util\systeminfo_win32.cpp" />
     <ClCompile Include="..\util\text.cpp" />
+    <ClCompile Include="..\util\timer.cpp" />
     <ClCompile Include="..\util\trace.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
@@ -1349,6 +1350,8 @@
     <ClInclude Include="..\util\signal_handlers.h" />
     <ClInclude Include="..\util\stacktrace.h" />
     <ClInclude Include="..\util\systeminfo.h" />
+    <ClInclude Include="..\util\timer-win32-inl.h" />
+    <ClInclude Include="..\util\timer.h" />
     <ClInclude Include="..\util\trace.h" />
     <ClInclude Include="..\util\version.h" />
     <ClInclude Include="balance.h" />
@@ -1378,8 +1381,6 @@
     <ClInclude Include="..\db\jsobj.h" />
     <ClInclude Include="..\db\json.h" />
     <ClInclude Include="..\pch.h" />
-    <ClInclude Include="..\..\boostw\boost_1_34_1\boost\config\auto_link.hpp" />
-    <ClInclude Include="..\..\boostw\boost_1_34_1\boost\version.hpp" />
     <ClInclude Include="..\..\third_party\pcre-8.30\config.h" />
     <ClInclude Include="..\..\third_party\pcre-8.30\pcre.h" />
     <ClInclude Include="..\client\connpool.h" />