diff options
Diffstat (limited to 'src/FbTk/Resource.cc')
-rw-r--r-- | src/FbTk/Resource.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc index 4be85de..af0c4c2 100644 --- a/src/FbTk/Resource.cc +++ b/src/FbTk/Resource.cc | |||
@@ -25,11 +25,7 @@ | |||
25 | #include "StringUtil.hh" | 25 | #include "StringUtil.hh" |
26 | 26 | ||
27 | #include <iostream> | 27 | #include <iostream> |
28 | #ifdef HAVE_CASSERT | 28 | #include <cassert> |
29 | #include <cassert> | ||
30 | #else | ||
31 | #include <assert.h> | ||
32 | #endif | ||
33 | 29 | ||
34 | using std::cerr; | 30 | using std::cerr; |
35 | using std::endl; | 31 | using std::endl; |
@@ -38,9 +34,9 @@ using std::string; | |||
38 | namespace FbTk { | 34 | namespace FbTk { |
39 | 35 | ||
40 | ResourceManager::ResourceManager(const char *filename, bool lock_db) : | 36 | ResourceManager::ResourceManager(const char *filename, bool lock_db) : |
41 | m_db_lock(0), | 37 | m_db_lock(0), |
42 | m_database(0), | 38 | m_database(0), |
43 | m_filename(filename ? filename : "") | 39 | m_filename(filename ? filename : "") |
44 | { | 40 | { |
45 | static bool xrm_initialized = false; | 41 | static bool xrm_initialized = false; |
46 | if (!xrm_initialized) { | 42 | if (!xrm_initialized) { |