commit 149e02cf7da50ac526f7d850c2ecd9570e943f9b
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Mon Jul 27 13:22:22 2015 -0700
committer Spyridon Mastorakis <spiros.mastorakis@gmail.com> Mon Aug 17 16:17:33 2015 -0700
tree 5d0b1a1dfc5a19f5bba7501958382815a810b0f0
parent a714792b032295988f35ea30fd738683fbdb4580

Enhance exception throwing with Boost Exception library

Change-Id: I471023fc23ffaebe04d9668426b4c1b03e4919aa
Refs: #2541

rib/fib-updater.cpp

diff --git a/rib/fib-updater.cpp b/rib/fib-updater.cpp
index 8d581be..91d1bdd 100644
--- a/rib/fib-updater.cpp
+++ b/rib/fib-updater.cpp
@@ -305,7 +305,8 @@
     }
   }
   else {
-    throw Error("Non-recoverable error: " + error + " code: " + std::to_string(code));
+    BOOST_THROW_EXCEPTION(Error("Non-recoverable error: " + error + " code: " +
+                                std::to_string(code)));
   }
 }
 

rib/nrd.cpp

diff --git a/rib/nrd.cpp b/rib/nrd.cpp
index bdfab99..bcee83c 100644
--- a/rib/nrd.cpp
+++ b/rib/nrd.cpp
@@ -143,7 +143,7 @@
     return make_shared<ndn::TcpTransport>("localhost", port);
   }
   else {
-    throw Error("No transport is available to communicate with NFD");
+    BOOST_THROW_EXCEPTION(Error("No transport is available to communicate with NFD"));
   }
 }
 

rib/remote-registrator.cpp

diff --git a/rib/remote-registrator.cpp b/rib/remote-registrator.cpp
index aa45269..d33ba1b 100644
--- a/rib/remote-registrator.cpp
+++ b/rib/remote-registrator.cpp
@@ -90,8 +90,8 @@
         }
       else
         {
-          throw ConfigFile::Error("Unrecognized option \"" + i.first +
-                                  "\" in \"remote-registrator\" section");
+          BOOST_THROW_EXCEPTION(ConfigFile::Error("Unrecognized option \"" + i.first +
+                                                  "\" in \"remote-registrator\" section"));
         }
     }
 

rib/rib-manager.cpp

diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index 4c03f3b..91f0eda 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -167,7 +167,7 @@
       m_remoteRegistrator.enable();
     }
     else {
-      throw Error("Unrecognized rib property: " + item.first);
+      BOOST_THROW_EXCEPTION(Error("Unrecognized rib property: " + item.first));
     }
   }
 
@@ -571,7 +571,7 @@
 void
 RibManager::onNrdCommandPrefixAddNextHopError(const Name& name, const std::string& msg)
 {
-  throw Error("Error in setting interest filter (" + name.toUri() + "): " + msg);
+  BOOST_THROW_EXCEPTION(Error("Error in setting interest filter (" + name.toUri() + "): " + msg));
 }
 
 void
@@ -586,7 +586,7 @@
   std::ostringstream os;
   os << "Couldn't enable local control header "
      << "(code: " << code << ", info: " << reason << ")";
-  throw Error(os.str());
+  BOOST_THROW_EXCEPTION(Error(os.str()));
 }
 
 void