Skip to content

Fix all warnings in a Windows build. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix all warnings in a Windows build. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions P4Plugin/P4Plugin.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ _SCL_SECURE_NO_DEPRECATE
<AdditionalDependencies>libclient.lib;libeay32.lib;ssleay32.lib;librpc.lib;libsupp.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
<Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y
echo f | if exist "$(SolutionDir)$(Configuration)\$(TargetName).pdb" xcopy "$(SolutionDir)$(Configuration)\$(TargetName).pdb" "$(SolutionDir)Build\Win32\$(TargetName).pdb" /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -167,15 +168,14 @@ _SCL_SECURE_NO_DEPRECATE
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>$(ProjectDir)Source\r16.1\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libclient.lib;libeay32.lib;ssleay32.lib;librpc.lib;libsupp.lib;ws2_32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y
echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetName).pdb" "$(SolutionDir)Build\Win32\$(TargetName).pdb" /Y</Command>
<Command>echo f | xcopy "$(SolutionDir)$(Configuration)\$(TargetFileName)" "$(SolutionDir)Build\Win32\$(TargetFileName)" /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion P4Plugin/Source/P4Task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ bool P4Task::IsOnline()
static std::string FormatFingerprintMessage(const std::string& statusMessage)
{
std::string noNewlines = statusMessage;
for (int i = 0; i < noNewlines.size(); i++)
for (size_t i = 0; i < noNewlines.size(); i++)
{
if (noNewlines[i] == '\n')
noNewlines[i] = ' ';
Expand Down
4 changes: 2 additions & 2 deletions Test/Source/TestServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ int run(int argc, char* argv[])
noresults = newbaseline;
verbose = argc > 4 ? std::string(argv[4]) == "verbose" && !newbaseline : false;
char buffer[4096];
char *answer = getcwd(buffer, sizeof(buffer));
char *answer = _getcwd(buffer, sizeof(buffer));
if (answer)
{
absroot = buffer;
Expand Down Expand Up @@ -289,7 +289,7 @@ static int runScript(ExternalProcess& p, const std::string& testDir, const std::
{
std::string delfile = command.substr(delfiletoken.length(), command.length() - 1 - delfiletoken.length());
// Delete a local file
unlink(delfile.c_str());
_unlink(delfile.c_str());
continue;
}
if (command.find(sleepToken) == 0)
Expand Down
2 changes: 1 addition & 1 deletion Test/TestServer/TestServer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down