From afa83d864527cf76a1d0cead36ba70e288bed465 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sat, 11 May 2019 14:14:06 +0200 Subject: [PATCH] Yet another small improvements to library initialization code. --- docs/d2/dad/_hash_8h_source.html | 2 +- docs/d4/d85/_job_object_8h_source.html | 2 +- docs/d5/d3b/_global_8h_source.html | 4 ++-- include/MUtils/Global.h | 20 +++++++++++++------- src/Global.cpp | 13 ++++++------- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/docs/d2/dad/_hash_8h_source.html b/docs/d2/dad/_hash_8h_source.html index e2b95ce..9263762 100644 --- a/docs/d2/dad/_hash_8h_source.html +++ b/docs/d2/dad/_hash_8h_source.html @@ -73,7 +73,7 @@ $(function() {
MUtils::Hash::HASH_BLAKE2_512
static const quint16 HASH_BLAKE2_512
Hash algorithm identifier.
Definition: Hash.h:42
MUtils::Hash::HASH_KECCAK_384
static const quint16 HASH_KECCAK_384
Hash algorithm identifier.
Definition: Hash.h:45
MUtils
Global MUtils namespace.
Definition: CPUFeatures.h:37
-
MUTILS_NO_COPY
#define MUTILS_NO_COPY(CLASS)
Disables copy constructor and assignment operator in the specified class. This macro should be used i...
Definition: Global.h:416
+
MUTILS_NO_COPY
#define MUTILS_NO_COPY(CLASS)
Disables copy constructor and assignment operator in the specified class. This macro should be used i...
Definition: Global.h:422
MUtils::Hash::create
MUTILS_API Hash * create(const quint16 &hashId, const char *const key=NULL)
Create instance of a hash function.
MUtils::Hash::Hash
This abstract class specifies the generic interface for all support hash algorithms.
Definition: Hash.h:57
MUtils::Hash::HASH_KECCAK_256
static const quint16 HASH_KECCAK_256
Hash algorithm identifier.
Definition: Hash.h:44
diff --git a/docs/d4/d85/_job_object_8h_source.html b/docs/d4/d85/_job_object_8h_source.html index ea186dc..c825c4f 100644 --- a/docs/d4/d85/_job_object_8h_source.html +++ b/docs/d4/d85/_job_object_8h_source.html @@ -70,7 +70,7 @@ $(function() { Go to the documentation of this file.
1 // MuldeR's Utilities for Qt
3 // Copyright (C) 2004-2019 LoRd_MuldeR <MuldeR2@GMX.de>
4 //
5 // This library is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU Lesser General Public
7 // License as published by the Free Software Foundation; either
8 // version 2.1 of the License, or (at your option) any later version.
9 //
10 // This library is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 // Lesser General Public License for more details.
14 //
15 // You should have received a copy of the GNU Lesser General Public
16 // License along with this library; if not, write to the Free Software
17 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 //
19 // http://www.gnu.org/licenses/lgpl-2.1.txt
21 
31 #pragma once
32 
33 #include <MUtils/Global.h>
34 
35 class QProcess;
36 
37 namespace MUtils
38 {
46  class MUTILS_API JobObject
47  {
48  public:
54  JobObject(void);
55 
61  ~JobObject(void);
62 
70  bool isObjectCreated(void);
71 
81  bool addProcessToJob(const QProcess *const process);
82 
92  bool terminateJob(const quint32 &exitCode);
93 
94  private:
95  uintptr_t m_jobPtr;
96  MUTILS_NO_COPY(JobObject)
97  };
98 }
Global.h
This file contains miscellaneous functions that are generally useful for Qt-based applications...
MUtils::JobObject
This class represents a job object.
Definition: JobObject.h:46
MUtils
Global MUtils namespace.
Definition: CPUFeatures.h:37
-
MUTILS_NO_COPY
#define MUTILS_NO_COPY(CLASS)
Disables copy constructor and assignment operator in the specified class. This macro should be used i...
Definition: Global.h:416
+
MUTILS_NO_COPY
#define MUTILS_NO_COPY(CLASS)
Disables copy constructor and assignment operator in the specified class. This macro should be used i...
Definition: Global.h:422
diff --git a/docs/d5/d3b/_global_8h_source.html b/docs/d5/d3b/_global_8h_source.html index 3d07cf2..f6c6a09 100644 --- a/docs/d5/d3b/_global_8h_source.html +++ b/docs/d5/d3b/_global_8h_source.html @@ -67,12 +67,12 @@ $(function() {
Global.h
-Go to the documentation of this file.
1 // MuldeR's Utilities for Qt
3 // Copyright (C) 2004-2019 LoRd_MuldeR <MuldeR2@GMX.de>
4 //
5 // This library is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU Lesser General Public
7 // License as published by the Free Software Foundation; either
8 // version 2.1 of the License, or (at your option) any later version.
9 //
10 // This library is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 // Lesser General Public License for more details.
14 //
15 // You should have received a copy of the GNU Lesser General Public
16 // License along with this library; if not, write to the Free Software
17 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 //
19 // http://www.gnu.org/licenses/lgpl-2.1.txt
21 
27 #pragma once
28 
29 #include <QString>
30 
31 //Forward Declarations
32 class QProcess;
33 class QDir;
34 template<typename K, typename V> class QHash;
35 
37 
41  //Interface version
42 #define MUTILS_INTERFACE 2
43 
44 //Build key
45 #define MUTILS_BUILD_KEY_HELPER(X,Y) X##" "##Y
46 #define MUTILS_BUILD_KEY MUTILS_BUILD_KEY_HELPER(__DATE__, __TIME__)
47 
48 //MUtils API
49 #ifdef _MSC_VER
50 # ifdef MUTILS_DLL_EXPORT
51 # define MUTILS_API __declspec(dllexport)
52 # else
53 # ifndef MUTILS_STATIC_LIB
54 # define MUTILS_API __declspec(dllimport)
55 # else
56 # define MUTILS_API /*static lib*/
57 # endif
58 # endif
59 #else
60 # define MUTILS_API
61 #endif
62 
63 //Check Debug Flags
64 #if defined(_DEBUG) || defined(DEBUG) || (!defined(NDEBUG))
65 # define MUTILS_DEBUG (1)
66 # if defined(NDEBUG) || defined(QT_NO_DEBUG) || (!defined(QT_DEBUG))
67 # error Inconsistent DEBUG flags have been detected!
68 # endif
69 #else
70 # define MUTILS_DEBUG (0)
71 # if (!defined(NDEBUG)) || (!defined(QT_NO_DEBUG)) || defined(QT_DEBUG)
72 # error Inconsistent DEBUG flags have been detected!
73 # endif
74 #endif
75 
76 //Check CPU options
77 #if defined(_MSC_VER) && (!defined(__INTELLISENSE__)) && (!defined(_M_X64)) && defined(_M_IX86_FP)
78  #if (_M_IX86_FP != 0)
79  #error We should not enabled SSE or SSE2 in release builds!
80  #endif
81 #endif
82 
83 #define MUTILS_MAKE_STRING_HELPER(X) #X
84 #define MUTILS_MAKE_STRING(X) MUTILS_MAKE_STRING_HELPER(X)
85 #define MUTILS_COMPILER_WARNING(TXT) __pragma(message(__FILE__ "(" MUTILS_MAKE_STRING(__LINE__) ") : warning: " TXT))
86 
87 #define MUTILS_INIT_GLUE_HELPER(X,Y) X##Y
88 #define MUTILS_INIT_GLUE(X,Y) MUTILS_INIT_GLUE_HELPER(X,Y)
89 #define MUTILS_INITIALIZER MUTILS_INIT_GLUE(initialize_, MUTILS_INTERFACE)
90 
94 
99 namespace MUtils
100 {
104  typedef struct _fp_parts_t { double parts[2]; } fp_parts_t;
105 
113  MUTILS_API const QString& temp_folder(void);
114 
128  MUTILS_API void init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir = true, const QStringList *const extraPaths = NULL, const QHash<QString, QString> *const extraEnv = NULL);
129 
137  MUTILS_API quint32 next_rand_u32(void);
138  MUTILS_API quint32 next_rand_u32(const quint32 max);
139 
147  MUTILS_API quint64 next_rand_u64(void);
148 
158  MUTILS_API QString next_rand_str(const bool &bLong = false);
159 
173  MUTILS_API QString make_temp_file(const QString &basePath, const QString &extension, const bool placeholder = false);
174  MUTILS_API QString make_temp_file(const QDir &basePath, const QString &extension, const bool placeholder = false);
175 
191  MUTILS_API QString make_unique_file(const QString &basePath, const QString &baseName, const QString &extension, const bool fancy = false, const bool placeholder = false);
192  MUTILS_API QString make_unique_file(const QDir &basePath, const QString &baseName, const QString &extension, const bool fancy = false, const bool placeholder = false);
193 
201  MUTILS_API bool parity(quint32 value);
202 
212  MUTILS_API bool remove_file(const QString &fileName);
213 
225  MUTILS_API bool remove_directory(const QString &folderPath, const bool &recursive);
226 
236  MUTILS_API QString& trim_right(QString &str);
237 
247  MUTILS_API QString& trim_left(QString &str);
248 
258  MUTILS_API QString trim_right(const QString &str);
259 
269  MUTILS_API QString trim_left(const QString &str);
270 
280  MUTILS_API void natural_string_sort(QStringList &list, const bool bIgnoreCase);
281 
293  MUTILS_API QString clean_file_name(const QString &name, const bool &pretty);
294 
306  MUTILS_API QString clean_file_path(const QString &path, const bool &pretty);
307 
319  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 &value);
320  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 &value);
321  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 &value, const size_t &offset);
322  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 &value, const size_t &offset);
323 
337  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 *values, const size_t &count);
338  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 *values, const size_t &count);
339  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 *values, const size_t &offset, const size_t &count);
340  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 *values, const size_t &offset, const size_t &count);
341 
351  MUTILS_API QStringList available_codepages(const bool &noAliases = true);
352 
362  MUTILS_API fp_parts_t break_fp(const double value);
363 
364  //Internal
365  namespace Internal
366  {
367  MUTILS_API int MUTILS_INITIALIZER(const char *const buildKey, const bool debug);
368  static const int s_initializedFlag = MUTILS_INITIALIZER(MUTILS_BUILD_KEY, MUTILS_DEBUG);
369  }
370 }
371 
373 
376 #define MUTILS_DELETE(PTR) do { if((PTR)) { delete (PTR); (PTR) = NULL; } } while(0)
377 
380 #define MUTILS_DELETE_ARRAY(PTR) do { if((PTR)) { delete [] (PTR); (PTR) = NULL; } } while(0)
381 
384 #define MUTILS_ZERO_MEMORY(PTR) memset(&(PTR), 0, sizeof((PTR)))
385 
388 #define MUTILS_WCHR(STR) (reinterpret_cast<const wchar_t*>((STR).utf16()))
389 
392 #define MUTILS_UTF8(STR) ((STR).toUtf8().constData())
393 
396 #define MUTILS_L1STR(STR) ((STR).toLatin1().constData())
397 
400 #define MUTILS_QSTR(STR) (QString::fromUtf16(reinterpret_cast<const unsigned short*>((STR))))
401 
404 #define MUTILS_BOOL2STR(X) ((X) ? "1" : "0")
405 
408 #define MUTILS_BOOLIFY(X) (!(!(X)))
409 
412 #define MUTILS_ARR2LEN(X) (sizeof((X)) / sizeof((X)[0]))
413 
416 #define MUTILS_NO_COPY(CLASS) \
417  CLASS(const CLASS &) { throw "Copy constructor is disabled!"; } \
418  CLASS &operator=(const CLASS &) { throw "Assignment operator is disabled!"; }
MUtils::available_codepages
MUTILS_API QStringList available_codepages(const bool &noAliases=true)
Retrieve a list of all available codepages.
+Go to the documentation of this file.
1 // MuldeR's Utilities for Qt
3 // Copyright (C) 2004-2019 LoRd_MuldeR <MuldeR2@GMX.de>
4 //
5 // This library is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU Lesser General Public
7 // License as published by the Free Software Foundation; either
8 // version 2.1 of the License, or (at your option) any later version.
9 //
10 // This library is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 // Lesser General Public License for more details.
14 //
15 // You should have received a copy of the GNU Lesser General Public
16 // License along with this library; if not, write to the Free Software
17 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18 //
19 // http://www.gnu.org/licenses/lgpl-2.1.txt
21 
27 #pragma once
28 
29 #include <QString>
30 
31 //Forward Declarations
32 class QProcess;
33 class QDir;
34 template<typename K, typename V> class QHash;
35 
37 
41  //Interface version
42 #define MUTILS_INTERFACE 2
43 
44 //Build key
45 #define MUTILS_BUILD_KEY_HELPER(X,Y) X##" "##Y
46 #define MUTILS_BUILD_KEY MUTILS_BUILD_KEY_HELPER(__DATE__, __TIME__)
47 
48 //MUtils API
49 #ifdef _MSC_VER
50 # ifdef MUTILS_DLL_EXPORT
51 # define MUTILS_API __declspec(dllexport)
52 # else
53 # ifndef MUTILS_STATIC_LIB
54 # define MUTILS_API __declspec(dllimport)
55 # else
56 # define MUTILS_API /*static lib*/
57 # endif
58 # endif
59 #else
60 # define MUTILS_API
61 #endif
62 
63 //Check Debug Flags
64 #if defined(_DEBUG) || defined(DEBUG) || (!defined(NDEBUG))
65 # define MUTILS_DEBUG (1)
66 # if defined(NDEBUG) || defined(QT_NO_DEBUG) || (!defined(QT_DEBUG))
67 # error Inconsistent DEBUG flags have been detected!
68 # endif
69 #else
70 # define MUTILS_DEBUG (0)
71 # if (!defined(NDEBUG)) || (!defined(QT_NO_DEBUG)) || defined(QT_DEBUG)
72 # error Inconsistent DEBUG flags have been detected!
73 # endif
74 #endif
75 
76 //Check CPU options
77 #if defined(_MSC_VER) && (!defined(__INTELLISENSE__)) && (!defined(_M_X64)) && defined(_M_IX86_FP)
78  #if (_M_IX86_FP != 0)
79  #error We should not enabled SSE or SSE2 in release builds!
80  #endif
81 #endif
82 
83 //Library initializer
84 #define MUTILS_GLUE_NAME_HELPER(X,Y) X##Y
85 #define MUTILS_GLUE_NAME(X,Y) MUTILS_GLUE_NAME_HELPER(X,Y)
86 #if MUTILS_DEBUG
87 #define MUTILS_INITIALIZER MUTILS_GLUE_NAME(initialize_d, MUTILS_INTERFACE)
88 #else
89 #define MUTILS_INITIALIZER MUTILS_GLUE_NAME(initialize_r, MUTILS_INTERFACE)
90 #endif
91 
92 //Compiler warnings
93 #define MUTILS_MAKE_STRING_HELPER(X) #X
94 #define MUTILS_MAKE_STRING(X) MUTILS_MAKE_STRING_HELPER(X)
95 #define MUTILS_COMPILER_WARNING(TXT) __pragma(message(__FILE__ "(" MUTILS_MAKE_STRING(__LINE__) ") : warning: " TXT))
96 
100 
105 namespace MUtils
106 {
110  typedef struct _fp_parts_t { double parts[2]; } fp_parts_t;
111 
119  MUTILS_API const QString& temp_folder(void);
120 
134  MUTILS_API void init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir = true, const QStringList *const extraPaths = NULL, const QHash<QString, QString> *const extraEnv = NULL);
135 
143  MUTILS_API quint32 next_rand_u32(void);
144  MUTILS_API quint32 next_rand_u32(const quint32 max);
145 
153  MUTILS_API quint64 next_rand_u64(void);
154 
164  MUTILS_API QString next_rand_str(const bool &bLong = false);
165 
179  MUTILS_API QString make_temp_file(const QString &basePath, const QString &extension, const bool placeholder = false);
180  MUTILS_API QString make_temp_file(const QDir &basePath, const QString &extension, const bool placeholder = false);
181 
197  MUTILS_API QString make_unique_file(const QString &basePath, const QString &baseName, const QString &extension, const bool fancy = false, const bool placeholder = false);
198  MUTILS_API QString make_unique_file(const QDir &basePath, const QString &baseName, const QString &extension, const bool fancy = false, const bool placeholder = false);
199 
207  MUTILS_API bool parity(quint32 value);
208 
218  MUTILS_API bool remove_file(const QString &fileName);
219 
231  MUTILS_API bool remove_directory(const QString &folderPath, const bool &recursive);
232 
242  MUTILS_API QString& trim_right(QString &str);
243 
253  MUTILS_API QString& trim_left(QString &str);
254 
264  MUTILS_API QString trim_right(const QString &str);
265 
275  MUTILS_API QString trim_left(const QString &str);
276 
286  MUTILS_API void natural_string_sort(QStringList &list, const bool bIgnoreCase);
287 
299  MUTILS_API QString clean_file_name(const QString &name, const bool &pretty);
300 
312  MUTILS_API QString clean_file_path(const QString &path, const bool &pretty);
313 
325  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 &value);
326  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 &value);
327  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 &value, const size_t &offset);
328  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 &value, const size_t &offset);
329 
343  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 *values, const size_t &count);
344  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 *values, const size_t &count);
345  MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 *values, const size_t &offset, const size_t &count);
346  MUTILS_API bool regexp_parse_int32(const QRegExp &regexp, qint32 *values, const size_t &offset, const size_t &count);
347 
357  MUTILS_API QStringList available_codepages(const bool &noAliases = true);
358 
368  MUTILS_API fp_parts_t break_fp(const double value);
369 
370  //Internal (do *not* call directly!)
371  namespace Internal
372  {
373  MUTILS_API int MUTILS_INITIALIZER(const unsigned int interfaceId, const bool debugFlag, const char *const buildKey);
374  static const int s_initializedFlag = MUTILS_INITIALIZER(MUTILS_INTERFACE, MUTILS_DEBUG, MUTILS_BUILD_KEY);
375  }
376 }
377 
379 
382 #define MUTILS_DELETE(PTR) do { if((PTR)) { delete (PTR); (PTR) = NULL; } } while(0)
383 
386 #define MUTILS_DELETE_ARRAY(PTR) do { if((PTR)) { delete [] (PTR); (PTR) = NULL; } } while(0)
387 
390 #define MUTILS_ZERO_MEMORY(PTR) memset(&(PTR), 0, sizeof((PTR)))
391 
394 #define MUTILS_WCHR(STR) (reinterpret_cast<const wchar_t*>((STR).utf16()))
395 
398 #define MUTILS_UTF8(STR) ((STR).toUtf8().constData())
399 
402 #define MUTILS_L1STR(STR) ((STR).toLatin1().constData())
403 
406 #define MUTILS_QSTR(STR) (QString::fromUtf16(reinterpret_cast<const unsigned short*>((STR))))
407 
410 #define MUTILS_BOOL2STR(X) ((X) ? "1" : "0")
411 
414 #define MUTILS_BOOLIFY(X) (!(!(X)))
415 
418 #define MUTILS_ARR2LEN(X) (sizeof((X)) / sizeof((X)[0]))
419 
422 #define MUTILS_NO_COPY(CLASS) \
423  CLASS(const CLASS &) { throw "Copy constructor is disabled!"; } \
424  CLASS &operator=(const CLASS &) { throw "Assignment operator is disabled!"; }
MUtils::available_codepages
MUTILS_API QStringList available_codepages(const bool &noAliases=true)
Retrieve a list of all available codepages.
MUtils::fp_parts_t
struct MUtils::_fp_parts_t fp_parts_t
This struct containes the parts (integral and fractional part) of a floating-point number...
MUtils::next_rand_str
MUTILS_API QString next_rand_str(const bool &bLong=false)
Generates a random string.
MUtils::remove_file
MUTILS_API bool remove_file(const QString &fileName)
Deletes the specified file.
MUtils::clean_file_path
MUTILS_API QString clean_file_path(const QString &path, const bool &pretty)
Clean up a file path string.
-
MUtils::_fp_parts_t
This struct containes the parts (integral and fractional part) of a floating-point number...
Definition: Global.h:104
+
MUtils::_fp_parts_t
This struct containes the parts (integral and fractional part) of a floating-point number...
Definition: Global.h:110
MUtils::natural_string_sort
MUTILS_API void natural_string_sort(QStringList &list, const bool bIgnoreCase)
Sort a list of strings using "natural ordering" algorithm.
MUtils::regexp_parse_uint32
MUTILS_API bool regexp_parse_uint32(const QRegExp &regexp, quint32 &value)
Parse regular expression results.
MUtils::parity
MUTILS_API bool parity(quint32 value)
Computes the parity of the given unsigned 32-Bit value.
diff --git a/include/MUtils/Global.h b/include/MUtils/Global.h index c56d8f1..f01f86b 100644 --- a/include/MUtils/Global.h +++ b/include/MUtils/Global.h @@ -80,14 +80,20 @@ template class QHash; #endif #endif +//Library initializer +#define MUTILS_GLUE_NAME_HELPER(X,Y) X##Y +#define MUTILS_GLUE_NAME(X,Y) MUTILS_GLUE_NAME_HELPER(X,Y) +#if MUTILS_DEBUG +#define MUTILS_INITIALIZER MUTILS_GLUE_NAME(initialize_d, MUTILS_INTERFACE) +#else +#define MUTILS_INITIALIZER MUTILS_GLUE_NAME(initialize_r, MUTILS_INTERFACE) +#endif + +//Compiler warnings #define MUTILS_MAKE_STRING_HELPER(X) #X #define MUTILS_MAKE_STRING(X) MUTILS_MAKE_STRING_HELPER(X) #define MUTILS_COMPILER_WARNING(TXT) __pragma(message(__FILE__ "(" MUTILS_MAKE_STRING(__LINE__) ") : warning: " TXT)) -#define MUTILS_INIT_GLUE_HELPER(X,Y) X##Y -#define MUTILS_INIT_GLUE(X,Y) MUTILS_INIT_GLUE_HELPER(X,Y) -#define MUTILS_INITIALIZER MUTILS_INIT_GLUE(initialize_, MUTILS_INTERFACE) - /** \endcond INTERNAL */ @@ -361,11 +367,11 @@ namespace MUtils */ MUTILS_API fp_parts_t break_fp(const double value); - //Internal + //Internal (do *not* call directly!) namespace Internal { - MUTILS_API int MUTILS_INITIALIZER(const char *const buildKey, const bool debug); - static const int s_initializedFlag = MUTILS_INITIALIZER(MUTILS_BUILD_KEY, MUTILS_DEBUG); + MUTILS_API int MUTILS_INITIALIZER(const unsigned int interfaceId, const bool debugFlag, const char *const buildKey); + static const int s_initializedFlag = MUTILS_INITIALIZER(MUTILS_INTERFACE, MUTILS_DEBUG, MUTILS_BUILD_KEY); } } diff --git a/src/Global.cpp b/src/Global.cpp index 447c758..bf45e59 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -905,16 +905,15 @@ MUtils::fp_parts_t MUtils::break_fp(const double value) // INITIALIZER /////////////////////////////////////////////////////////////////////////////// -int MUtils::Internal::MUTILS_INITIALIZER(const char *const buildKey, const bool debug) +int MUtils::Internal::MUTILS_INITIALIZER(const unsigned int interfaceId, const bool debugFlag, const char *const buildKey) { - static const bool INTERNAL_DEBUG_FLAG = MUTILS_DEBUG; - static const char *const INTERNAL_BUILD_KEY = MUTILS_BUILD_KEY; - - if((debug != INTERNAL_DEBUG_FLAG) || strncmp(buildKey, INTERNAL_BUILD_KEY, 11)) +#if (!MUTILS_DEBUG) + if((interfaceId != static_cast(MUTILS_INTERFACE)) || (debugFlag != static_cast(MUTILS_DEBUG)) || strncmp(buildKey, MUTILS_BUILD_KEY, 14)) { - MUtils::OS::system_message_err(L"MUtils", L"FATAL: MUtils library initialization has failed!"); - abort(); + OS::system_message_err(L"MUtils", L"ERROR: MUtils library initialization has failed!"); + for(;;) _exit((int)0xC0000142); } +#endif //MUTILS_DEBUG volatile int _result = MUTILS_INTERFACE; return _result; -- 2.11.0