Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
VANet
Commits
753a0f34
Commit
753a0f34
authored
Sep 05, 2016
by
Jonas Stienen
Browse files
Removing 'greater than 1.15' vista dependency, since VA is now only supporting newer versions
parent
ab7279ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
753a0f34
...
...
@@ -7,14 +7,10 @@ list( APPEND CMAKE_MODULE_PATH "$ENV{VISTA_CMAKE_COMMON}" )
include
(
VistaCommon
)
vista_use_package
(
VistaCoreLibs REQUIRED COMPONENTS VistaInterProcComm
)
vista_use_package
(
VistaCoreLibs REQUIRED COMPONENTS VistaInterProcComm
FIND_DEPENDENCIES
)
vista_use_package
(
VABase REQUIRED
)
if
(
NOT DEFINED ITA_VANET_WITH_VISTACORELIBS_GREATER_1_15
)
set
(
ITA_VANET_WITH_VISTACORELIBS_GREATER_1_15 OFF CACHE BOOL
"SetWaitForDescriptorEventSelectIsEnabled available in VistaCoreLibs?"
)
endif
(
NOT DEFINED ITA_VANET_WITH_VISTACORELIBS_GREATER_1_15
)
if
(
NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS
)
set
(
ITA_VANET_INSTALL_WITH_DLLS ON CACHE BOOL
"Install VANet with depending DLLs (use this switch with care)"
)
endif
(
NOT DEFINED ITA_VANET_INSTALL_WITH_DLLS
)
...
...
@@ -28,10 +24,6 @@ include_directories( "include" )
add_definitions
(
-DVABASE_DLL -DVANET_DLL -DVANET_EXPORTS
)
if
(
ITA_VANET_WITH_VISTACORELIBS_GREATER_1_15
)
add_definitions
(
-DVISTACORELIBS_VERSION_GREATER_1_15
)
endif
(
ITA_VANET_WITH_VISTACORELIBS_GREATER_1_15
)
add_library
(
VANet
"
${
ProjectSources
}
"
)
target_link_libraries
(
VANet
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
...
...
src/VANetServerImpl.cpp
View file @
753a0f34
...
...
@@ -214,19 +214,15 @@ public:
try
{
#ifdef VISTACORELIBS_VERSION_GREATER_1_15
m_mapConnections
[
nUpdateID
]
->
SetWaitForDescriptorEventSelectIsEnabled
(
false
);
#endif // VISTACORELIBS_VERSION_GREATER_1_15
if
(
m_pProtocol
->
ProcessMessageFromClient
(
m_mapConnections
[
nUpdateID
]
)
==
false
)
{
m_pParent
->
RemoveClient
(
m_mapConnections
[
nUpdateID
],
CVANetNetworkProtocol
::
VA_NET_SERVER_DISCONNECT
);
}
else
{
#ifdef VISTACORELIBS_VERSION_GREATER_1_15
if
(
m_mapConnections
[
nUpdateID
]
)
m_mapConnections
[
nUpdateID
]
->
SetWaitForDescriptorEventSelectIsEnabled
(
true
);
#endif // VISTACORELIBS_VERSION_GREATER_1_15
}
}
catch
(
CVAException
&
)
...
...
@@ -238,7 +234,7 @@ public:
virtual
void
PreLoop
()
{
#if VANET_SERVER_VERBOSE==1
#if VANET_SERVER_VERBOSE
==
1
std
::
cout
<<
"VA Server: starting connection update loop"
<<
std
::
endl
;
#endif
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment