diff --git a/include/ontologenius/core/ontoGraphs/Branchs/RelationsWithInductions.h b/include/ontologenius/core/ontoGraphs/Branchs/RelationsWithInductions.h index c7312a48..3214e2a2 100644 --- a/include/ontologenius/core/ontoGraphs/Branchs/RelationsWithInductions.h +++ b/include/ontologenius/core/ontoGraphs/Branchs/RelationsWithInductions.h @@ -28,8 +28,8 @@ namespace ontologenius { RelationsWithInductions(const RelationsWithInductions& other) = delete; ~RelationsWithInductions() { clear(); } - inline size_t size() const { return relations.size(); } - inline bool empty() const { return relations.empty(); } + size_t size() const { return relations.size(); } + bool empty() const { return relations.empty(); } T& operator[](size_t index) { return relations[index]; } size_t pushBack(T& relation) @@ -74,12 +74,12 @@ namespace ontologenius { return std::find(relations.begin(), relations.end(), other); } - inline typename std::vector::iterator begin() { return relations.begin(); } - inline typename std::vector::iterator end() { return relations.end(); } - inline typename std::vector::const_iterator cbegin() const { return relations.cbegin(); } - inline typename std::vector::const_iterator cend() const { return relations.cend(); } - inline typename std::vector::reverse_iterator rbegin() { return relations.rbegin(); } - inline typename std::vector::reverse_iterator rend() { return relations.rend(); } + typename std::vector::iterator begin() { return relations.begin(); } + typename std::vector::iterator end() { return relations.end(); } + typename std::vector::const_iterator cbegin() const { return relations.cbegin(); } + typename std::vector::const_iterator cend() const { return relations.cend(); } + typename std::vector::reverse_iterator rbegin() { return relations.rbegin(); } + typename std::vector::reverse_iterator rend() { return relations.rend(); } }; } // namespace ontologenius diff --git a/include/ontologenius/core/ontoGraphs/Branchs/ValuedNode.h b/include/ontologenius/core/ontoGraphs/Branchs/ValuedNode.h index b39e4554..26e9ba81 100644 --- a/include/ontologenius/core/ontoGraphs/Branchs/ValuedNode.h +++ b/include/ontologenius/core/ontoGraphs/Branchs/ValuedNode.h @@ -42,7 +42,7 @@ namespace ontologenius { Dictionary steady_dictionary_; template - inline void conditionalPushBack(std::vector& vect, const C& data) + void conditionalPushBack(std::vector& vect, const C& data) { if(std::find(vect.begin(), vect.end(), data) == vect.end()) vect.push_back(data); diff --git a/include/ontologenius/core/ontoGraphs/Branchs/WordTable.h b/include/ontologenius/core/ontoGraphs/Branchs/WordTable.h index f43e842a..bb99128f 100644 --- a/include/ontologenius/core/ontoGraphs/Branchs/WordTable.h +++ b/include/ontologenius/core/ontoGraphs/Branchs/WordTable.h @@ -18,34 +18,34 @@ namespace ontologenius { table_.emplace_back(""); // index 0 is reserved for the "no result index" } - inline index_t add(const std::string& value) + index_t add(const std::string& value) { table_.push_back(value); return (index_t)table_.size() - 1; } - inline std::string& get(index_t index) + std::string& get(index_t index) { return table_[index]; } - inline std::string& operator[](index_t index) + std::string& operator[](index_t index) { return table_[index]; } - inline const std::string& operator[](index_t index) const + const std::string& operator[](index_t index) const { return table_[index]; } - inline void index2string(std::unordered_set& res, const std::unordered_set& base) + void index2string(std::unordered_set& res, const std::unordered_set& base) { for(index_t i : base) res.insert(table_[i]); } - inline size_t size() const + size_t size() const { return table_.size(); } diff --git a/include/ontologenius/core/ontoGraphs/Graphs/Graph.h b/include/ontologenius/core/ontoGraphs/Graphs/Graph.h index 0dc68642..b547ef6b 100644 --- a/include/ontologenius/core/ontoGraphs/Graphs/Graph.h +++ b/include/ontologenius/core/ontoGraphs/Graphs/Graph.h @@ -104,7 +104,7 @@ namespace ontologenius { // use std::lock_guard lock(mutex_); to WRITE A DATA // use std::shared_lock lock(mutex_); to READ A DATA - inline void removeFromDictionary(std::map>& dictionary, const std::string& lang, const std::string& word) + void removeFromDictionary(std::map>& dictionary, const std::string& lang, const std::string& word) { if(dictionary.find(lang) != dictionary.end()) { @@ -117,7 +117,7 @@ namespace ontologenius { } template - inline void removeFromVect(std::vector& vect, const T& value) + void removeFromVect(std::vector& vect, const T& value) { for(size_t i = 0; i < vect.size();) if(vect[i] == value) @@ -127,7 +127,7 @@ namespace ontologenius { } template - inline void removeFromElemVect(std::vector>& vect, const T& value) + void removeFromElemVect(std::vector>& vect, const T& value) { for(size_t i = 0; i < vect.size();) if(vect[i].elem == value) @@ -137,7 +137,7 @@ namespace ontologenius { } template - inline void removeFromElemVect(RelationsWithInductions>& vect, const T& value) + void removeFromElemVect(RelationsWithInductions>& vect, const T& value) { for(size_t i = 0; i < vect.size();) if(vect[i].elem == value) @@ -147,7 +147,7 @@ namespace ontologenius { } template - inline void getInMap(T** ptr, const std::string& name, std::map& map) + void getInMap(T** ptr, const std::string& name, std::map& map) { if(*ptr != nullptr) return; @@ -158,7 +158,7 @@ namespace ontologenius { } template - inline bool conditionalPushBack(std::vector& vect, const C& data) + bool conditionalPushBack(std::vector& vect, const C& data) { if(std::find(vect.begin(), vect.end(), data) == vect.end()) { @@ -170,7 +170,7 @@ namespace ontologenius { } template - inline bool conditionalPushBack(RelationsWithInductions& vect, const C& data) + bool conditionalPushBack(RelationsWithInductions& vect, const C& data) { if(std::find(vect.begin(), vect.end(), data) == vect.end()) { @@ -182,7 +182,7 @@ namespace ontologenius { } template - inline bool conditionalPushBack(std::vector>& vect, const SingleElement& data) + bool conditionalPushBack(std::vector>& vect, const SingleElement& data) { auto it = std::find(vect.begin(), vect.end(), data); if(it == vect.end()) @@ -197,7 +197,7 @@ namespace ontologenius { } template - inline bool conditionalPushBack(RelationsWithInductions>& vect, const SingleElement& data) + bool conditionalPushBack(RelationsWithInductions>& vect, const SingleElement& data) { auto it = std::find(vect.begin(), vect.end(), data); if(it == vect.end())