summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorGravatar bunnei2015-02-23 01:23:15 -0500
committerGravatar bunnei2015-02-23 01:23:15 -0500
commit50a0c4f14fc0c6df4db63a5593c6ff477736034c (patch)
tree3ec4860e931eb307faf6cdd06504a82baad95e00 /src/common
parentMerge pull request #598 from Subv/dpt (diff)
parentAdded information reporting from ThrowFatalError (diff)
downloadyuzu-50a0c4f14fc0c6df4db63a5593c6ff477736034c.tar.gz
yuzu-50a0c4f14fc0c6df4db63a5593c6ff477736034c.tar.xz
yuzu-50a0c4f14fc0c6df4db63a5593c6ff477736034c.zip
Merge pull request #581 from archshift/tfe
Added information reporting from ThrowFatalError
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common_funcs.h2
-rw-r--r--src/common/logging/backend.cpp1
-rw-r--r--src/common/logging/log.h1
3 files changed, 2 insertions, 2 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index bc296ed3e..d56156e4a 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -14,8 +14,6 @@
14#define SLEEP(x) usleep(x*1000) 14#define SLEEP(x) usleep(x*1000)
15#endif 15#endif
16 16
17template <bool> struct CompileTimeAssert;
18template<> struct CompileTimeAssert<true> {};
19 17
20#define b2(x) ( (x) | ( (x) >> 1) ) 18#define b2(x) ( (x) | ( (x) >> 1) )
21#define b4(x) ( b2(x) | ( b2(x) >> 2) ) 19#define b4(x) ( b2(x) | ( b2(x) >> 2) )
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 8fee20a83..7c1010b22 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -33,6 +33,7 @@ static std::shared_ptr<Logger> global_logger;
33 CLS(Service) \ 33 CLS(Service) \
34 SUB(Service, SRV) \ 34 SUB(Service, SRV) \
35 SUB(Service, FS) \ 35 SUB(Service, FS) \
36 SUB(Service, ERR) \
36 SUB(Service, APT) \ 37 SUB(Service, APT) \
37 SUB(Service, GSP) \ 38 SUB(Service, GSP) \
38 SUB(Service, AC) \ 39 SUB(Service, AC) \
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 6c5ca3968..7b67b3c07 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -53,6 +53,7 @@ enum class Class : ClassType {
53 /// should have its own subclass. 53 /// should have its own subclass.
54 Service_SRV, ///< The SRV (Service Directory) implementation 54 Service_SRV, ///< The SRV (Service Directory) implementation
55 Service_FS, ///< The FS (Filesystem) service implementation 55 Service_FS, ///< The FS (Filesystem) service implementation
56 Service_ERR, ///< The ERR (Error) port implementation
56 Service_APT, ///< The APT (Applets) service 57 Service_APT, ///< The APT (Applets) service
57 Service_GSP, ///< The GSP (GPU control) service 58 Service_GSP, ///< The GSP (GPU control) service
58 Service_AC, ///< The AC (WiFi status) service 59 Service_AC, ///< The AC (WiFi status) service