tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the return type for Utility::LoadExtensionLibrary

This commit is contained in:
Gunnar Beutner 2015-03-03 07:18:47 +01:00
parent bdb2a15e27
commit 7c31654552
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/base/utility.cpp
View File

@ -299,12 +299,7 @@ void Utility::Sleep(double timeout)
*
* @param library The name of the library.
*/
#ifdef _WIN32
HMODULE
#else /* _WIN32 */
void *
#endif /* _WIN32 */
Utility::LoadExtensionLibrary(const String& library)
void Utility::LoadExtensionLibrary(const String& library)
{
String path;
#if defined(_WIN32)
@ -336,9 +331,6 @@ Utility::LoadExtensionLibrary(const String& library)
#endif /* _WIN32 */
ExecuteDeferredInitializers();
return hModule;
}
boost::thread_specific_ptr<std::vector<boost::function<void(void)> > >& Utility::GetDeferredInitializers(void)
@ -1255,4 +1247,4 @@ String Utility::UnescapeString(const String& s)
}
return result.str();
}
}

8
lib/base/utility.hpp
View File

@ -94,13 +94,7 @@ public:
static String FormatDateTime(const char *format, double ts);
static String FormatErrorNumber(int code);
static
#ifdef _WIN32
HMODULE
#else /* _WIN32 */
void *
#endif /* _WIN32 */
LoadExtensionLibrary(const String& library);
static void LoadExtensionLibrary(const String& library);
static void AddDeferredInitializer(const boost::function<void(void)>& callback);
static void ExecuteDeferredInitializers(void);

2
lib/cli/daemoncommand.cpp
View File

@ -55,7 +55,7 @@ static String LoadAppType(const String& typeSpec)
String library = typeSpec.SubStr(0, index);
(void) Utility::LoadExtensionLibrary(library);
Utility::LoadExtensionLibrary(library);
return typeSpec.SubStr(index + 1);
}

2
lib/config/configcompiler.cpp
View File

@ -171,7 +171,7 @@ Expression *ConfigCompiler::HandleIncludeRecursive(const String& path, const Str
*/
void ConfigCompiler::HandleLibrary(const String& library)
{
(void) Utility::LoadExtensionLibrary(library);
Utility::LoadExtensionLibrary(library);
}
void ConfigCompiler::CompileHelper(void)