diff options
author | nyamatongwe <devnull@localhost> | 2003-04-18 10:26:34 +0000 |
---|---|---|
committer | nyamatongwe <devnull@localhost> | 2003-04-18 10:26:34 +0000 |
commit | 1805788277237ea895b016637b07a1027f5e28a7 (patch) | |
tree | 9b74bf864ac3d95df62e5a8d854b0f6e59848cc7 | |
parent | 3999fd3df65cf0123df03b9e3004c09a74928926 (diff) | |
download | scintilla-mirror-1805788277237ea895b016637b07a1027f5e28a7.tar.gz |
Changed Function* to simpler Function.
-rw-r--r-- | gtk/PlatGTK.cxx | 4 | ||||
-rw-r--r-- | include/Platform.h | 8 | ||||
-rw-r--r-- | win32/PlatWin.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index d0778c707..b3f5247e1 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1933,12 +1933,12 @@ public: } // Use g_module_symbol to get a pointer to the relevant function. - virtual Function *FindFunction(const char *name) { + virtual Function FindFunction(const char *name) { if (m != NULL) { gpointer fn_address = NULL; gboolean status = g_module_symbol(m, name, &fn_address); if (status) - return static_cast<Function*>( fn_address ); + return static_cast<Function>(fn_address); else return NULL; } else diff --git a/include/Platform.h b/include/Platform.h index 63c9514e8..342208ae0 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -435,13 +435,13 @@ public: class DynamicLibrary { public: virtual ~DynamicLibrary() {}; - + /// @return Pointer to function "name", or NULL on failure. - virtual Function *FindFunction(const char *name) = 0; - + virtual Function FindFunction(const char *name) = 0; + /// @return true if the library was loaded successfully. virtual bool IsValid() = 0; - + /// @return An instance of a DynamicLibrary subclass with "modulePath" loaded. static DynamicLibrary *Load(const char *modulePath); }; diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index c92b274cb..472c8b9a2 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -1302,9 +1302,9 @@ public: } // Use GetProcAddress to get a pointer to the relevant function. - virtual Function *FindFunction(const char *name) { + virtual Function FindFunction(const char *name) { if (h != NULL) { - return static_cast<Function*>( + return static_cast<Function>( (void *)(::GetProcAddress(h, name))); } else return NULL; |