Skip to content
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.

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

Cleanup: Remove a ton of unnecessary ";" (that cause pedantic warnings). #1258

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/meas_cutter/src/ecal_meas_cutter_globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ namespace EcalMeasCutterGlobals
+ (VERSION_MINOR * 1000)
+ (VERSION_MAJOR * 1000 * 1000));
}
};
}
48 changes: 24 additions & 24 deletions app/mon/mon_cli/src/ecal_mon_cli_defs.h
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
;/* ========================= eCAL LICENSE =================================
; *
; * Copyright (C) 2016 - 2019 Continental Corporation
; *
; * Licensed under the Apache License, Version 2.0 (the "License");
; * you may not use this file except in compliance with the License.
; * You may obtain a copy of the License at
; *
; * http://www.apache.org/licenses/LICENSE-2.0
; *
; * Unless required by applicable law or agreed to in writing, software
; * distributed under the License is distributed on an "AS IS" BASIS,
; * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; * See the License for the specific language governing permissions and
; * limitations under the License.
; *
; * ========================= eCAL LICENSE =================================
;*/
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================= eCAL LICENSE =================================
*/

;/**
; * eCALMon CLI version definition
;**/
/**
* eCALMon CLI version definition
**/

#pragma once

;/* version parsed out into numeric values */
/* version parsed out into numeric values */
#define ECAL_MON_CLI_VERSION_MAJOR 1
#define ECAL_MON_CLI_VERSION_MINOR 0
#define ECAL_MON_CLI_VERSION_PATCH 2

;/* version as string */
/* version as string */
#define ECAL_MON_CLI_VERSION "1.0.2"
#define ECAL_MON_CLI_DATE "13.03.2020"

;/* name as string */
/* name as string */
#define ECAL_MON_CLI_NAME "eCALMon CLI"
2 changes: 1 addition & 1 deletion app/mon/mon_gui/src/ecalmon_globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ namespace EcalmonGlobals
+ (VERSION_MINOR * 1000)
+ (VERSION_MAJOR * 1000 * 1000));
}
};
}
48 changes: 24 additions & 24 deletions app/mon/mon_tui/src/ecal_mon_tui_defs.h
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
;/* ========================= eCAL LICENSE =================================
; *
; * Copyright (C) 2016 - 2019 Continental Corporation
; *
; * Licensed under the Apache License, Version 2.0 (the "License");
; * you may not use this file except in compliance with the License.
; * You may obtain a copy of the License at
; *
; * http://www.apache.org/licenses/LICENSE-2.0
; *
; * Unless required by applicable law or agreed to in writing, software
; * distributed under the License is distributed on an "AS IS" BASIS,
; * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; * See the License for the specific language governing permissions and
; * limitations under the License.
; *
; * ========================= eCAL LICENSE =================================
;*/
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================= eCAL LICENSE =================================
*/

;/**
; * eCALMon TUI version definition
;**/
/**
* eCALMon TUI version definition
**/

#pragma once

;/* version parsed out into numeric values */
/* version parsed out into numeric values */
#define ECAL_MON_TUI_VERSION_MAJOR 1
#define ECAL_MON_TUI_VERSION_MINOR 0
#define ECAL_MON_TUI_VERSION_PATCH 0

;/* version as string */
/* version as string */
#define ECAL_MON_TUI_VERSION "1.0.0"
#define ECAL_MON_TUI_DATE "11.10.2022"

;/* name as string */
/* name as string */
#define ECAL_MON_TUI_NAME "eCALMon TUI"
2 changes: 1 addition & 1 deletion app/play/play_core/include/ecal_play_globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ namespace EcalPlayGlobals
+ (VERSION_MINOR * 1000)
+ (VERSION_MAJOR * 1000 * 1000));
}
};
}
30 changes: 15 additions & 15 deletions app/rec/rec_gui/src/qecalrec.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ bool QEcalRec::setHostFilter(const std::string& hostname, const std::set<std::st
return success;
}

std::set<std::string> QEcalRec::hostFilter(const std::string& hostname) const { return rec_server_->GetHostFilter(hostname); };
std::set<std::string> QEcalRec::hostFilter(const std::string& hostname) const { return rec_server_->GetHostFilter(hostname); }

bool QEcalRec::setConnectionToClientsActive(bool active, bool omit_dialogs)
{
Expand Down Expand Up @@ -200,7 +200,7 @@ bool QEcalRec::setConnectionToClientsActive(bool active, bool omit_dialogs)
return success;
}

bool QEcalRec::connectionToClientsActive() const { return rec_server_->IsConnectionToClientsActive(); };
bool QEcalRec::connectionToClientsActive() const { return rec_server_->IsConnectionToClientsActive(); }

////////////////////////////////////
// Recorder control
Expand Down Expand Up @@ -366,9 +366,9 @@ bool QEcalRec::stopRecording(bool omit_dialogs)
return success;
}

bool QEcalRec::connectedToEcal() const { return rec_server_->IsConnectedToEcal(); };
bool QEcalRec::connectedToEcal() const { return rec_server_->IsConnectedToEcal(); }

bool QEcalRec::recording() const { return rec_server_->IsRecording(); };
bool QEcalRec::recording() const { return rec_server_->IsRecording(); }

int64_t QEcalRec::currentlyRecordingMeasId() const { return rec_server_->GetCurrentlyRecordingMeasId(); }

Expand All @@ -382,9 +382,9 @@ void QEcalRec::waitForPendingRequests() const { rec_server_->WaitForPendingReque
// Status
////////////////////////////////////

eCAL::rec_server::RecorderStatusMap_T QEcalRec::recorderStatuses() const { return rec_server_->GetRecorderStatuses(); };
eCAL::rec_server::RecorderStatusMap_T QEcalRec::recorderStatuses() const { return rec_server_->GetRecorderStatuses(); }

eCAL::rec::RecorderStatus QEcalRec::builtInRecorderInstanceStatus() const { return rec_server_->GetBuiltInRecorderInstanceStatus(); };
eCAL::rec::RecorderStatus QEcalRec::builtInRecorderInstanceStatus() const { return rec_server_->GetBuiltInRecorderInstanceStatus(); }

eCAL::rec_server::TopicInfoMap_T QEcalRec::topicInfo() const { return rec_server_->GetTopicInfo(); }

Expand Down Expand Up @@ -529,11 +529,11 @@ bool QEcalRec::setTopicWhitelist(const std::set<std::string>& topic_whitelist, b
}
}

std::chrono::steady_clock::duration QEcalRec::maxPreBufferLength () const { return rec_server_->GetMaxPreBufferLength(); };
bool QEcalRec::preBufferingEnabled() const { return rec_server_->GetPreBufferingEnabled(); };
eCAL::rec::RecordMode QEcalRec::recordMode () const { return rec_server_->GetRecordMode(); };
std::set<std::string> QEcalRec::topicBlacklist () const { return topic_blacklist_; };
std::set<std::string> QEcalRec::topicWhitelist () const { return topic_whitelist_; };
std::chrono::steady_clock::duration QEcalRec::maxPreBufferLength () const { return rec_server_->GetMaxPreBufferLength(); }
bool QEcalRec::preBufferingEnabled() const { return rec_server_->GetPreBufferingEnabled(); }
eCAL::rec::RecordMode QEcalRec::recordMode () const { return rec_server_->GetRecordMode(); }
std::set<std::string> QEcalRec::topicBlacklist () const { return topic_blacklist_; }
std::set<std::string> QEcalRec::topicWhitelist () const { return topic_whitelist_; }

////////////////////////////////////
// Job Settings
Expand Down Expand Up @@ -574,10 +574,10 @@ void QEcalRec::setDescription(const std::string& description)
emit descriptionChangedSignal(description);
}

std::string QEcalRec::measRootDir () const { return rec_server_->GetMeasRootDir(); };
std::string QEcalRec::measName () const { return rec_server_->GetMeasName(); };
unsigned int QEcalRec::maxFileSizeMib() const { return rec_server_->GetMaxFileSizeMib(); };
std::string QEcalRec::description () const { return rec_server_->GetDescription(); };
std::string QEcalRec::measRootDir () const { return rec_server_->GetMeasRootDir(); }
std::string QEcalRec::measName () const { return rec_server_->GetMeasName(); }
unsigned int QEcalRec::maxFileSizeMib() const { return rec_server_->GetMaxFileSizeMib(); }
std::string QEcalRec::description () const { return rec_server_->GetDescription(); }

////////////////////////////////////
// Server Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ int JobHistoryJobItem::type() const

int64_t JobHistoryJobItem::jobId() const { return local_evaluated_job_config_.GetJobId(); }
const eCAL::rec::JobConfig& JobHistoryJobItem::localEvaluatedJobConfig() const { return local_evaluated_job_config_; }
std::chrono::system_clock::time_point JobHistoryJobItem::timestamp() const { return local_start_timestamp_; };
std::chrono::system_clock::time_point JobHistoryJobItem::timestamp() const { return local_start_timestamp_; }
bool JobHistoryJobItem::isDeleted() const { return is_deleted_; }

void JobHistoryJobItem::setIsDeleted(bool is_deleted) { is_deleted_ = is_deleted; }
Expand Down
2 changes: 1 addition & 1 deletion app/rec/rec_server_cli/src/commands/table_printer.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace eCAL
constexpr int REVERSE = (1 << 5);
constexpr int CONCEALED = (1 << 6);
constexpr int CROSSED = (1 << 7);
};
}

struct TableEntry
{
Expand Down
6 changes: 3 additions & 3 deletions app/rec/rec_server_core/src/rec_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ namespace eCAL
uint16_t RecServer::GetInternalFtpServerPort() const { return rec_server_impl_->GetInternalFtpServerPort(); }

eCAL::rec::Error RecServer::UploadMeasurement(int64_t meas_id) { return rec_server_impl_->UploadMeasurement(meas_id); }
bool RecServer::CanUploadMeasurement(int64_t meas_id) const { return rec_server_impl_->CanUploadMeasurement(meas_id); };
eCAL::rec::Error RecServer::SimulateUploadMeasurement(int64_t meas_id) const { return rec_server_impl_->SimulateUploadMeasurement(meas_id); };
bool RecServer::CanUploadMeasurement(int64_t meas_id) const { return rec_server_impl_->CanUploadMeasurement(meas_id); }
eCAL::rec::Error RecServer::SimulateUploadMeasurement(int64_t meas_id) const { return rec_server_impl_->SimulateUploadMeasurement(meas_id); }

int RecServer::UploadNonUploadedMeasurements() { return rec_server_impl_->UploadNonUploadedMeasurements(); };
int RecServer::UploadNonUploadedMeasurements() { return rec_server_impl_->UploadNonUploadedMeasurements(); }

bool RecServer::HasAnyUploadError(int64_t meas_id) const { return rec_server_impl_->HasAnyUploadError(meas_id); }

Expand Down
48 changes: 24 additions & 24 deletions contrib/mma/include/mma_defs.h
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
;/* ========================= eCAL LICENSE =================================
; *
; * Copyright (C) 2016 - 2019 Continental Corporation
; *
; * Licensed under the Apache License, Version 2.0 (the "License");
; * you may not use this file except in compliance with the License.
; * You may obtain a copy of the License at
; *
; * http://www.apache.org/licenses/LICENSE-2.0
; *
; * Unless required by applicable law or agreed to in writing, software
; * distributed under the License is distributed on an "AS IS" BASIS,
; * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; * See the License for the specific language governing permissions and
; * limitations under the License.
; *
; * ========================= eCAL LICENSE =================================
;*/
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================= eCAL LICENSE =================================
*/

;/**
; * @brief MMA version definition
;**/
/**
* @brief MMA version definition
**/

#pragma once

;/* application name */
/* application name */
#define MMA_APPLICATION_NAME "Machine Monitoring Agent"

;/* version parsed out into numeric values */
/* version parsed out into numeric values */
#define MMA_VERSION_MAJOR 1
#define MMA_VERSION_MINOR 0
#define MMA_VERSION_PATCH 8

;/* version as string */
/* version as string */
#define MMA_VERSION "v.1.0.8.20170224"
#define MMA_DATE "24.02.2017"
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -207,4 +207,4 @@ namespace eCAL
* @param data_ Event callback data structure with the event specific informations.
**/
typedef std::function<void(const char* name_, const struct SServerEventCallbackData* data_)> ServerEventCallbackT;
};
}
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_publisher.h
Original file line number Diff line number Diff line change
Expand Up @@ -549,4 +549,4 @@ namespace eCAL
bool m_created;
bool m_initialized;
};
};
}
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_service_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ namespace eCAL
* @param service_response_ Service response struct containing the (responding) server informations and the response itself.
**/
typedef std::function<void(const struct SServiceResponse& service_response_)> ResponseCallbackT;
};
}
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_subscriber.h
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,4 @@ namespace eCAL
bool m_created;
bool m_initialized;
};
};
}
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ namespace eCAL
inline CDynamicSubscriber::~CDynamicSubscriber()
{
Destroy();
};
}

inline void CDynamicSubscriber::Create(const std::string& topic_name_)
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_descgate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,4 @@ namespace eCAL
resp_type_desc_ = (*service_info_map_it).second.info.response_type.descriptor;
return true;
}
};
}
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_descgate.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ namespace eCAL
inline CDescGate::QualityFlags& operator|= (CDescGate::QualityFlags& a, CDescGate::QualityFlags b) { return reinterpret_cast<CDescGate::QualityFlags&>( reinterpret_cast<std::underlying_type<CDescGate::QualityFlags>::type&>(a) |= static_cast<std::underlying_type<CDescGate::QualityFlags>::type>(b) ); }
inline CDescGate::QualityFlags& operator&= (CDescGate::QualityFlags& a, CDescGate::QualityFlags b) { return reinterpret_cast<CDescGate::QualityFlags&>( reinterpret_cast<std::underlying_type<CDescGate::QualityFlags>::type&>(a) &= static_cast<std::underlying_type<CDescGate::QualityFlags>::type>(b) ); }
inline CDescGate::QualityFlags& operator^= (CDescGate::QualityFlags& a, CDescGate::QualityFlags b) { return reinterpret_cast<CDescGate::QualityFlags&>( reinterpret_cast<std::underlying_type<CDescGate::QualityFlags>::type&>(a) ^= static_cast<std::underlying_type<CDescGate::QualityFlags>::type>(b) ); }
};
}
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace eCAL
CGlobals::~CGlobals()
{
Finalize(Init::All);
};
}

int CGlobals::Initialize(unsigned int components_, std::vector<std::string>* config_keys_ /*= nullptr*/)
{
Expand Down
Loading