Modified to address compile errors with gcc 11.2.1.

adjacentlink · Nov 23, 2021 · 3e9534e · 3e9534e
1 parent 0fd4288
commit 3e9534e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/include/emane/configurationupdate.h b/include/emane/configurationupdate.h
@@ -101,7 +101,7 @@ namespace EMANE
    * which indicates an error when set @a false.
    */
   using ConfigurationValidator = 
-    std::function<std::pair<std::string,bool>(const ConfigurationUpdate & update) noexcept>;
+    std::function<std::pair<std::string,bool>(const ConfigurationUpdate & update)>;
 };
 
 #endif //EMANECONFIGURATIONUPDATE_HEADER_
diff --git a/include/emane/utils/functionwrapper.h b/include/emane/utils/functionwrapper.h
@@ -53,8 +53,8 @@ namespace EMANE
 
       FunctionWrapper & operator=(FunctionWrapper && rhs);
 
-    private:
       class ImplementaionBase;
+    private:
       std::unique_ptr<ImplementaionBase> pImpl_;
 
       FunctionWrapper(const FunctionWrapper &) = delete;

diff --git a/src/python/setup.py.in b/src/python/setup.py.in
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(name='emane',
       version='@VERSION@',

diff --git a/test/harness/phydownstreamspeed/utils.h b/test/harness/phydownstreamspeed/utils.h
@@ -85,7 +85,7 @@ namespace EMANE
                                                   "BroadcastPacketDropTable0"});
 
 
-      for(const auto entry : results)
+      for(const auto & entry : results)
         {
           std::vector<int> labelLengths;
           for(const auto & label : entry.second.first)

diff --git a/test/harness/phyupstreamscenario/main.cc b/test/harness/phyupstreamscenario/main.cc
@@ -860,7 +860,7 @@ int main(int argc, char * argv[])
                                                                                      "BroadcastPacketDropTable0"});
 
 
-                                  for(const auto entry : results)
+                                  for(const auto & entry : results)
                                     {
                                       std::cout<<"["<<iActionIndex<<"] "<<entry.first<<std::endl;
                                       std::vector<int> labelLengths;
@@ -894,7 +894,7 @@ int main(int argc, char * argv[])
                                                                                     {"ReceivePowerTable"});
 
 
-                                  for(const auto entry : results)
+                                  for(const auto & entry : results)
                                     {
                                       std::cout<<"["<<iActionIndex<<"] "<<entry.first<<std::endl;
                                       std::vector<int> labelLengths;

diff --git a/test/harness/phyupstreamspeed/utils.h b/test/harness/phyupstreamspeed/utils.h
@@ -82,7 +82,7 @@ namespace EMANE
     {
       auto results =
         StatisticService::instance()->queryTable(buildId,names);
-      for(const auto entry : results)
+      for(const auto & entry : results)
         {
           std::vector<int> labelLengths;
           for(const auto & label : entry.second.first)