Fix compile on CentOS 7

[xonotic/netradiant.git] / radiant / server.cpp

diff --git a/radiant/server.cpp b/radiant/server.cpp
index 500cc58e72682aecf8b733d708529bbf6f1072e9..4f83e0aca29b60cee3a9b5bf25c32a1b4c1294bc 100644 (file)
--- a/radiant/server.cpp
+++ b/radiant/server.cpp
@@ -22,18 +22,17 @@
 #include "server.h"
 
 #include "debugging/debugging.h"
-#include "warnings.h"
 
-#include <vector>
 #include <map>
+#include <vector>
 #include "os/path.h"
 
 #include "modulesystem.h"
 
 class RadiantModuleServer : public ModuleServer
 {
-typedef std::pair<CopiedString, int> ModuleType;
-typedef std::pair<ModuleType, CopiedString> ModuleKey;
+typedef std::pair<std::string, int> ModuleType;
+typedef std::pair<ModuleType, std::string> ModuleKey;
 typedef std::map<ModuleKey, Module*> Modules_;
 Modules_ m_modules;
 bool m_error;
@@ -71,11 +70,11 @@ void registerModule( const char* type, int version, const char* name, Module& mo
 }
 
 Module* findModule( const char* type, int version, const char* name ) const {
-       Modules_::const_iterator i = m_modules.find( ModuleKey( ModuleType( type, version ), name ) );
+       auto i = m_modules.find( ModuleKey( ModuleType( type, version ), name ) );
        if ( i != m_modules.end() ) {
-               return ( *i ).second;
+               return i->second;
        }
-       return 0;
+       return nullptr;
 }
 
 void foreachModule( const char* type, int version, const Visitor& visitor ){
@@ -131,7 +130,7 @@ bool failed(){
        return m_library == 0;
 }
 FunctionPointer findSymbol( const char* symbol ){
-       FunctionPointer address = GetProcAddress( m_library, symbol );
+       FunctionPointer address = (FunctionPointer) GetProcAddress( m_library, symbol );
        if ( address == 0 ) {
                globalErrorStream() << "GetProcAddress failed: '" << symbol << "'\n";
                globalErrorStream() << "GetLastError: " << FormatGetLastError();
@@ -144,62 +143,82 @@ FunctionPointer findSymbol( const char* symbol ){
 
 #include <dlfcn.h>
 
-class DynamicLibrary
-{
-void* m_library;
+class DynamicLibrary {
+       void *m_library;
 public:
-typedef int ( *FunctionPointer )();
+       using FunctionPointer = int (*)();
 
-DynamicLibrary( const char* filename ){
-       m_library = dlopen( filename, RTLD_NOW );
-}
-~DynamicLibrary(){
-       if ( !failed() ) {
-               dlclose( m_library );
+       DynamicLibrary(const char *filename)
+       {
+               m_library = dlopen(filename, RTLD_LOCAL
+                                                                        | RTLD_NOW
+                                                                        #ifndef __APPLE__
+                                                                        | RTLD_DEEPBIND
+#endif
+               );
+               auto error = dlerror();
+               if (!m_library || error) {
+                       globalErrorStream() << "LoadLibrary failed: '" << filename << "'\n";
+                       globalErrorStream() << "GetLastError: " << error;
+               }
        }
-}
-bool failed(){
-       return m_library == 0;
-}
-FunctionPointer findSymbol( const char* symbol ){
-       FunctionPointer p = (FunctionPointer)dlsym( m_library, symbol );
-       if ( p == 0 ) {
-               const char* error = reinterpret_cast<const char*>( dlerror() );
-               if ( error != 0 ) {
+
+       ~DynamicLibrary()
+       {
+               if (!failed()) {
+                       dlclose(m_library);
+               }
+       }
+
+       bool failed()
+       {
+               return m_library == nullptr;
+       }
+
+       FunctionPointer findSymbol(const char *symbol)
+       {
+               if (auto p = reinterpret_cast<FunctionPointer>(dlsym(m_library, symbol))) {
+                       return p;
+               }
+               if (auto error = reinterpret_cast<const char *>(dlerror())) {
                        globalErrorStream() << error;
                }
+               return nullptr;
        }
-       return p;
-}
 };
 
 #else
 #error "unsupported platform"
 #endif
 
-class DynamicLibraryModule
-{
-typedef void ( RADIANT_DLLIMPORT * RegisterModulesFunc )( ModuleServer& server );
-DynamicLibrary m_library;
-RegisterModulesFunc m_registerModule;
+class DynamicLibraryModule {
+       typedef void ( RADIANT_DLLIMPORT *RegisterModulesFunc )(ModuleServer &server);
+
+       DynamicLibrary m_library;
+       RegisterModulesFunc m_registerModule;
 public:
-DynamicLibraryModule( const char* filename )
-       : m_library( filename ), m_registerModule( 0 ){
-       if ( !m_library.failed() ) {
-               m_registerModule = reinterpret_cast<RegisterModulesFunc>( m_library.findSymbol( "Radiant_RegisterModules" ) );
+       DynamicLibraryModule(const char *filename)
+                       : m_library(filename), m_registerModule(nullptr)
+       {
+               if (!m_library.failed()) {
+                       m_registerModule = reinterpret_cast<RegisterModulesFunc>( m_library.findSymbol("Radiant_RegisterModules"));
 #if 0
-               if ( !m_registerModule ) {
-                       m_registerModule = reinterpret_cast<RegisterModulesFunc>( m_library.findSymbol( "Radiant_RegisterModules@4" ) );
-               }
+            if ( !m_registerModule ) {
+                m_registerModule = reinterpret_cast<RegisterModulesFunc>( m_library.findSymbol( "Radiant_RegisterModules@4" ) );
+            }
 #endif
+               }
+       }
+
+       bool failed()
+       {
+               return m_registerModule == nullptr;
+       }
+
+       void registerModules(ModuleServer &server)
+       {
+               m_registerModule(server);
        }
-}
-bool failed(){
-       return m_registerModule == 0;
-}
-void registerModules( ModuleServer& server ){
-       m_registerModule( server );
-}
 };