diff --git a/include/class_loader/class_loader_core.h b/include/class_loader/class_loader_core.h index afda035c..63b3aec0 100644 --- a/include/class_loader/class_loader_core.h +++ b/include/class_loader/class_loader_core.h @@ -258,8 +258,8 @@ Base * createInstance(const std::string & derived_class_name, ClassLoader * load obj = factory->create(); } else { - throw(class_loader::CreateClassException( - "Could not create instance of type " + derived_class_name)); + throw class_loader::CreateClassException( + "Could not create instance of type " + derived_class_name); } } diff --git a/include/class_loader/class_loader_exceptions.h b/include/class_loader/class_loader_exceptions.h index 1eaa358f..8bf74777 100644 --- a/include/class_loader/class_loader_exceptions.h +++ b/include/class_loader/class_loader_exceptions.h @@ -43,7 +43,7 @@ namespace class_loader class ClassLoaderException : public std::runtime_error { public: - explicit ClassLoaderException(const std::string error_desc) + explicit inline ClassLoaderException(const std::string error_desc) : std::runtime_error(error_desc) {} }; @@ -54,7 +54,7 @@ class ClassLoaderException : public std::runtime_error class LibraryLoadException : public ClassLoaderException { public: - explicit LibraryLoadException(const std::string error_desc) + explicit inline LibraryLoadException(const std::string error_desc) : ClassLoaderException(error_desc) {} }; @@ -65,7 +65,7 @@ class LibraryLoadException : public ClassLoaderException class LibraryUnloadException : public ClassLoaderException { public: - explicit LibraryUnloadException(const std::string error_desc) + explicit inline LibraryUnloadException(const std::string error_desc) : ClassLoaderException(error_desc) {} }; @@ -76,7 +76,7 @@ class LibraryUnloadException : public ClassLoaderException class CreateClassException : public ClassLoaderException { public: - explicit CreateClassException(const std::string error_desc) + explicit inline CreateClassException(const std::string error_desc) : ClassLoaderException(error_desc) {} }; @@ -87,7 +87,7 @@ class CreateClassException : public ClassLoaderException class NoClassLoaderExistsException : public ClassLoaderException { public: - explicit NoClassLoaderExistsException(const std::string error_desc) + explicit inline NoClassLoaderExistsException(const std::string error_desc) : ClassLoaderException(error_desc) {} }; diff --git a/src/class_loader_core.cpp b/src/class_loader_core.cpp index f9885ee9..ecc69d6b 100644 --- a/src/class_loader_core.cpp +++ b/src/class_loader_core.cpp @@ -451,18 +451,18 @@ void loadLibrary(const std::string & library_path, ClassLoader * loader) } catch (const Poco::LibraryLoadException & e) { setCurrentlyLoadingLibraryName(""); setCurrentlyActiveClassLoader(nullptr); - throw(class_loader::LibraryLoadException( - "Could not load library (Poco exception = " + std::string(e.message()) + ")")); + throw class_loader::LibraryLoadException( + "Could not load library (Poco exception = " + std::string(e.message()) + ")"); } catch (const Poco::LibraryAlreadyLoadedException & e) { setCurrentlyLoadingLibraryName(""); setCurrentlyActiveClassLoader(nullptr); - throw(class_loader::LibraryLoadException( - "Library already loaded (Poco exception = " + std::string(e.message()) + ")")); + throw class_loader::LibraryLoadException( + "Library already loaded (Poco exception = " + std::string(e.message()) + ")"); } catch (const Poco::NotFoundException & e) { setCurrentlyLoadingLibraryName(""); setCurrentlyActiveClassLoader(nullptr); - throw(class_loader::LibraryLoadException( - "Library not found (Poco exception = " + std::string(e.message()) + ")")); + throw class_loader::LibraryLoadException( + "Library not found (Poco exception = " + std::string(e.message()) + ")"); } setCurrentlyLoadingLibraryName(""); @@ -549,12 +549,12 @@ void unloadLibrary(const std::string & library_path, ClassLoader * loader) return; } catch (const Poco::RuntimeException & e) { delete (library); - throw(class_loader::LibraryUnloadException( - "Could not unload library (Poco exception = " + std::string(e.message()) + ")")); + throw class_loader::LibraryUnloadException( + "Could not unload library (Poco exception = " + std::string(e.message()) + ")"); } } - throw(class_loader::LibraryUnloadException( - "Attempt to unload library that class_loader is unaware of.")); + throw class_loader::LibraryUnloadException( + "Attempt to unload library that class_loader is unaware of."); } }