- Added missing dependency "ccnx-portal-rta", still needed for the control messages

- Fixed little typo for being compliant with the code style
- Removed include statements of deprecated library "ccnx-portal"
- added level of optimization of 3 by default

Change-Id: Id353e58fa1e7eeeb90bdf19ec7fd921876ab12c4
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>

3 files changed, 1 insertions, 6 deletions

diff --git a/icnet/ccnx/icnet_ccnx_local_connector.h b/icnet/ccnx/icnet_ccnx_local_connector.h
index b08d1c5a..2181df96 100644
--- a/icnet/ccnx/icnet_ccnx_local_connector.h
+++ b/icnet/ccnx/icnet_ccnx_local_connector.h
@@ -26,8 +26,6 @@ extern "C" {
 #include <ccnx/common/ccnx_Interest.h>
 #include <ccnx/common/ccnx_ContentObject.h>
 #include <parc/security/parc_Security.h>
-#include <ccnx/api/ccnx_Portal/ccnx_Portal.h>
-#include <ccnx/api/ccnx_Portal/ccnx_PortalRTA.h>
 #include <ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_PacketEncoder.h>
 };
 
diff --git a/icnet/ccnx/icnet_ccnx_portal.h b/icnet/ccnx/icnet_ccnx_portal.h
index 5076fcd9..9ccc4bc6 100644
--- a/icnet/ccnx/icnet_ccnx_portal.h
+++ b/icnet/ccnx/icnet_ccnx_portal.h
@@ -26,8 +26,6 @@
 #include <future>
 
 extern "C" {
-#include <ccnx/api/ccnx_Portal/ccnx_Portal.h>
-#include <ccnx/api/ccnx_Portal/ccnx_PortalRTA.h>
 #include <ccnx/api/control/cpi_Acks.h>
 #include <ccnx/common/ccnx_ContentObject.h>
 #include <parc/security/parc_Security.h>
diff --git a/icnet/transport/icnet_transport_vegas.cc b/icnet/transport/icnet_transport_vegas.cc
index 166e4ef0..b64678f7 100644
--- a/icnet/transport/icnet_transport_vegas.cc
+++ b/icnet/transport/icnet_transport_vegas.cc
@@ -208,8 +208,7 @@ void VegasTransportProtocol::decreaseWindow() {
 void VegasTransportProtocol::increaseWindow() {
   double max_window_size = -1;
   socket_->getSocketOption(MAX_WINDOW_SIZE, max_window_size);
-  if (current_window_size_ < max_window_size) // don't expand window above max level
-  {
+  if (current_window_size_ < max_window_size) {
     current_window_size_++;
     socket_->setSocketOption(CURRENT_WINDOW_SIZE, current_window_size_);
   }