diff options
| author | Daniel Neus <[email protected]> | 2016-01-09 12:37:13 +0100 |
|---|---|---|
| committer | Daniel Neus <[email protected]> | 2016-01-09 12:37:13 +0100 |
| commit | f391635f202cf6f83539bd69688975a30f5f874f (patch) | |
| tree | 206459e94ab379ba18a8e8035b1855327aa02126 /src/lib/utils/dyn_load/dyn_load.h | |
| parent | 52afcc69d97621e5a3880798d7814a474e71c03b (diff) | |
| parent | 791b3dc9947a94d35e6d54b274b0512fb0ebd09c (diff) | |
Merge remote-tracking branch 'remotes/github/master' into noreturn
# Conflicts:
# src/build-data/cc/gcc.txt
Diffstat (limited to 'src/lib/utils/dyn_load/dyn_load.h')
| -rw-r--r-- | src/lib/utils/dyn_load/dyn_load.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/utils/dyn_load/dyn_load.h b/src/lib/utils/dyn_load/dyn_load.h index 32227f76f..7a9f4a83c 100644 --- a/src/lib/utils/dyn_load/dyn_load.h +++ b/src/lib/utils/dyn_load/dyn_load.h @@ -58,8 +58,8 @@ class Dynamically_Loaded_Library Dynamically_Loaded_Library(const Dynamically_Loaded_Library&); Dynamically_Loaded_Library& operator=(const Dynamically_Loaded_Library&); - std::string lib_name; - void* lib; + std::string m_lib_name; + void* m_lib; }; } |