Skip to content

Commit

Permalink
Minor code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ash-j-f
ash-j-f committed May 4, 2018
1 parent 6d39423 commit ac601b3
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 24 deletions.
20 changes: 0 additions & 20 deletions ClusterFrac.sln
View file
Expand Up @@ -23,63 +23,43 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
DLLDebug|x64 = DLLDebug|x64
DLLDebug|x86 = DLLDebug|x86
DLLRelease|x64 = DLLRelease|x64
DLLRelease|x86 = DLLRelease|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.Debug|x64.ActiveCfg = Debug|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.Debug|x64.Build.0 = Debug|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.Debug|x86.ActiveCfg = Debug|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.DLLDebug|x64.ActiveCfg = DLLDebug|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.DLLDebug|x64.Build.0 = DLLDebug|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.DLLDebug|x86.ActiveCfg = DLLDebug|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.DLLRelease|x64.ActiveCfg = DLLRelease|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.DLLRelease|x64.Build.0 = DLLRelease|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.DLLRelease|x86.ActiveCfg = DLLRelease|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.Release|x64.ActiveCfg = Release|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.Release|x64.Build.0 = Release|x64
{25C22F5F-E5B8-4DC3-AE5D-A9465DEAB5FF}.Release|x86.ActiveCfg = Release|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.Debug|x64.ActiveCfg = Debug|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.Debug|x64.Build.0 = Debug|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.Debug|x86.ActiveCfg = Debug|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.DLLDebug|x64.ActiveCfg = DLLDebug|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.DLLDebug|x64.Build.0 = DLLDebug|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.DLLDebug|x86.ActiveCfg = DLLDebug|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.DLLRelease|x64.ActiveCfg = DLLRelease|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.DLLRelease|x64.Build.0 = DLLRelease|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.DLLRelease|x86.ActiveCfg = DLLRelease|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.Release|x64.ActiveCfg = Release|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.Release|x64.Build.0 = Release|x64
{955DFD0D-529B-4C4E-B65E-875D80C67175}.Release|x86.ActiveCfg = Release|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.Debug|x64.ActiveCfg = Debug|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.Debug|x64.Build.0 = Debug|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.Debug|x86.ActiveCfg = Debug|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.DLLDebug|x64.ActiveCfg = DLLDebug|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.DLLDebug|x64.Build.0 = DLLDebug|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.DLLDebug|x86.ActiveCfg = DLLDebug|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.DLLRelease|x64.ActiveCfg = DLLRelease|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.DLLRelease|x64.Build.0 = DLLRelease|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.DLLRelease|x86.ActiveCfg = DLLRelease|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.Release|x64.ActiveCfg = Release|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.Release|x64.Build.0 = Release|x64
{E63AF37B-63AB-4884-B759-D336EF606E65}.Release|x86.ActiveCfg = Release|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.Debug|x64.ActiveCfg = Debug|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.Debug|x64.Build.0 = Debug|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.Debug|x86.ActiveCfg = Debug|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.DLLDebug|x64.ActiveCfg = DLLDebug|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.DLLDebug|x64.Build.0 = DLLDebug|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.DLLDebug|x86.ActiveCfg = DLLDebug|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.DLLRelease|x64.ActiveCfg = DLLRelease|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.DLLRelease|x64.Build.0 = DLLRelease|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.DLLRelease|x86.ActiveCfg = DLLRelease|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.Release|x64.ActiveCfg = Release|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.Release|x64.Build.0 = Release|x64
{F5B81703-7A26-40B5-8342-2CDC30B7C5A6}.Release|x86.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file modified ClusterFrac/lib/ClusterFrac.lib
View file
Binary file not shown.
Binary file modified ClusterFrac/lib/ClusterFrac_DEBUG.lib
View file
Binary file not shown.
Binary file modified ClusterFrac/lib/ClusterFrac_DEBUG.pdb
View file
Binary file not shown.
1 change: 0 additions & 1 deletion ClusterFrac/source/HostListener.cpp
View file
Expand Up @@ -164,7 +164,6 @@ namespace cf
{
//Check if any other process still using the client socket.
//If so, then try again later.
//CF_SAY("listenThread remove dead clients try lock.");
std::unique_lock<std::mutex> lock(client->socketMutex, std::try_to_lock);
if (lock.owns_lock())
{
Expand Down
4 changes: 1 addition & 3 deletions ClusterFrac/source/HostSender.cpp
View file
Expand Up @@ -6,8 +6,6 @@ namespace cf
HostSender::HostSender(Host *newHost)
{
host = newHost;


}

HostSender::~HostSender()
Expand Down Expand Up @@ -53,7 +51,7 @@ namespace cf

//Socket is in non blocking mode, so more than one call to send may be needed to send all the data.
sf::Socket::Status status;
while (true && !cf::ConsoleMessager::getInstance()->exceptionThrown)
while (!cf::ConsoleMessager::getInstance()->exceptionThrown)
{
status = client->socket->send(packet);
if (status == sf::Socket::Status::Done)
Expand Down

0 comments on commit ac601b3

Please sign in to comment.