Move alexcpt to core

CMakeLists.txt

@@ -554,8 +554,6 @@ set(COMMON_OBJS
     common/albyte.h
     common/alcomplex.cpp
     common/alcomplex.h
-    common/alexcpt.cpp
-    common/alexcpt.h
     common/alfstream.cpp
     common/alfstream.h
     common/almalloc.cpp
@@ -596,6 +594,8 @@ set(CORE_OBJS
     core/bufferline.h
     core/devformat.cpp
     core/devformat.h
+    core/except.cpp
+    core/except.h
     core/filters/biquad.h
     core/filters/biquad.cpp
     core/filters/nfc.cpp

al/auxeffectslot.cpp

@@ -36,12 +36,12 @@
 
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "alu.h"
 #include "buffer.h"
+#include "core/except.h"
 #include "core/logging.h"
 #include "effect.h"
 #include "fpu_ctrl.h"

al/buffer.cpp

@@ -44,11 +44,11 @@
 #include "albyte.h"
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "atomic.h"
+#include "core/except.h"
 #include "inprogext.h"
 #include "opthelpers.h"
 

al/effect.cpp

@@ -40,10 +40,10 @@
 
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alstring.h"
+#include "core/except.h"
 #include "core/logging.h"
 #include "effects/base.h"
 #include "opthelpers.h"

al/effects/effects.h

@@ -3,7 +3,7 @@
 
 #include "AL/al.h"
 
-#include "alexcpt.h"
+#include "core/except.h"
 
 union EffectProps;
 

al/error.cpp

@@ -36,8 +36,8 @@
 #include "AL/alc.h"
 
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
+#include "core/except.h"
 #include "core/logging.h"
 #include "opthelpers.h"
 #include "vector.h"

al/event.cpp

@@ -19,9 +19,9 @@
 
 #include "albyte.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "async_event.h"
+#include "core/except.h"
 #include "core/logging.h"
 #include "effects/base.h"
 #include "inprogext.h"

al/extension.cpp

@@ -28,8 +28,8 @@
 #include "AL/alc.h"
 
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "alstring.h"
+#include "core/except.h"
 #include "opthelpers.h"
 
 

al/filter.cpp

@@ -38,9 +38,9 @@
 
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
+#include "core/except.h"
 #include "opthelpers.h"
 #include "vector.h"
 

al/listener.cpp

@@ -30,9 +30,9 @@
 #include "AL/efx.h"
 
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "atomic.h"
+#include "core/except.h"
 #include "opthelpers.h"
 
 

al/source.cpp

@@ -47,7 +47,6 @@
 
 #include "alcmain.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
@@ -59,6 +58,7 @@
 #include "bformatdec.h"
 #include "buffer.h"
 #include "core/ambidefs.h"
+#include "core/except.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
 #include "core/logging.h"

al/state.cpp

@@ -33,12 +33,12 @@
 #include "AL/alext.h"
 
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alspan.h"
 #include "alu.h"
 #include "atomic.h"
+#include "core/except.h"
 #include "event.h"
 #include "inprogext.h"
 #include "opthelpers.h"

alc/alc.cpp

@@ -68,7 +68,6 @@
 #include "albyte.h"
 #include "alconfig.h"
 #include "alcontext.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"
@@ -82,6 +81,7 @@
 #include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/devformat.h"
+#include "core/except.h"
 #include "core/mastering.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"

alc/backends/alsa.cpp

@@ -40,7 +40,6 @@
 #include "albyte.h"
 #include "alcmain.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"

alc/backends/base.cpp

@@ -13,7 +13,6 @@
 #endif
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alnumeric.h"
 #include "aloptional.h"
 #include "atomic.h"

alc/backends/base.h

@@ -8,7 +8,7 @@
 
 #include "albyte.h"
 #include "alcmain.h"
-#include "alexcpt.h"
+#include "core/except.h"
 
 
 using uint = unsigned int;

alc/backends/coreaudio.cpp

@@ -30,7 +30,6 @@
 #include <cmath>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "ringbuffer.h"
 #include "converter.h"

alc/backends/dsound.cpp

@@ -45,7 +45,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "core/logging.h"

alc/backends/jack.cpp

@@ -34,7 +34,6 @@
 #include "alcmain.h"
 #include "alu.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "core/logging.h"
 #include "dynload.h"
 #include "ringbuffer.h"

alc/backends/null.cpp

@@ -31,7 +31,6 @@
 #include <thread>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alu.h"
 #include "threads.h"

alc/backends/opensl.cpp

@@ -33,7 +33,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "core/logging.h"

alc/backends/oss.cpp

@@ -46,7 +46,6 @@
 #include "alcmain.h"
 #include "alconfig.h"
 #include "albyte.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "aloptional.h"

alc/backends/portaudio.cpp

@@ -27,7 +27,6 @@
 #include <cstring>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "alconfig.h"
 #include "core/logging.h"

alc/backends/pulseaudio.cpp

@@ -38,7 +38,6 @@
 #include "alcmain.h"
 #include "alu.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "compat.h"
 #include "core/logging.h"
 #include "dynload.h"

alc/backends/sdl2.cpp

@@ -30,7 +30,6 @@
 #include "AL/al.h"
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alu.h"
 #include "core/logging.h"

alc/backends/sndio.cpp

@@ -30,7 +30,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "core/logging.h"
 #include "ringbuffer.h"

alc/backends/solaris.cpp

@@ -40,7 +40,6 @@
 
 #include "alcmain.h"
 #include "albyte.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "alconfig.h"
 #include "compat.h"

alc/backends/wasapi.cpp

@@ -56,7 +56,6 @@
 #include <vector>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "converter.h"

alc/backends/wave.cpp

@@ -38,7 +38,6 @@
 #include "albyte.h"
 #include "alcmain.h"
 #include "alconfig.h"
-#include "alexcpt.h"
 #include "almalloc.h"
 #include "alnumeric.h"
 #include "alu.h"

alc/backends/winmm.cpp

@@ -39,7 +39,6 @@
 #include <functional>
 
 #include "alcmain.h"
-#include "alexcpt.h"
 #include "alu.h"
 #include "compat.h"
 #include "core/logging.h"

core/except.cpp

@@ -1,7 +1,7 @@
 
 #include "config.h"
 
-#include "alexcpt.h"
+#include "except.h"
 
 #include <cstdio>
 #include <cstdarg>

core/except.h

@@ -1,5 +1,5 @@
-#ifndef ALEXCPT_H
-#define ALEXCPT_H
+#ifndef CORE_EXCEPT_H
+#define CORE_EXCEPT_H
 
 #include <cstdarg>
 #include <exception>
@@ -28,4 +28,4 @@ public:
 
 #define END_API_FUNC catch(...) { std::terminate(); }
 
-#endif /* ALEXCPT_H */
+#endif /* CORE_EXCEPT_H */