aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Common
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-10-18 08:03:04 +0800
committerchai <chaifix@163.com>2018-10-18 08:03:04 +0800
commit392c4e7c42c000d82e641a3d04f0d2a01f0aca21 (patch)
treeaf48d292002245229843d28d364023e1ae72a3e3 /src/libjin/Common
parentb27581c3d9657a4a05191e47eed78d00ec0a46cd (diff)
*格式化代码
Diffstat (limited to 'src/libjin/Common')
-rw-r--r--src/libjin/Common/Singleton.hpp2
-rw-r--r--src/libjin/Common/Subsystem.hpp2
-rw-r--r--src/libjin/Common/utf8.cpp2
-rw-r--r--src/libjin/Common/utf8.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/libjin/Common/Singleton.hpp b/src/libjin/Common/Singleton.hpp
index cdb395f..12b1450 100644
--- a/src/libjin/Common/Singleton.hpp
+++ b/src/libjin/Common/Singleton.hpp
@@ -30,7 +30,7 @@ namespace jin
template<class T> T* Singleton<T>::_instance = nullptr;
-#define SINGLETON(T) friend Singleton<T>
+#define singleton(T) friend Singleton<T>
} // namespace jin
diff --git a/src/libjin/Common/Subsystem.hpp b/src/libjin/Common/Subsystem.hpp
index b9ca88b..293b88d 100644
--- a/src/libjin/Common/Subsystem.hpp
+++ b/src/libjin/Common/Subsystem.hpp
@@ -28,7 +28,7 @@ namespace jin
}
protected:
- SINGLETON(System);
+ singleton(System);
Subsystem() {};
virtual ~Subsystem() {};
diff --git a/src/libjin/Common/utf8.cpp b/src/libjin/Common/utf8.cpp
index 33ee128..b912a51 100644
--- a/src/libjin/Common/utf8.cpp
+++ b/src/libjin/Common/utf8.cpp
@@ -1,4 +1,4 @@
-#include "../jin_configuration.h"
+#include "../configuration.h"
#if LIBJIN_OS == LIBJIN_WINDOWS
#include "utf8.h"
diff --git a/src/libjin/Common/utf8.h b/src/libjin/Common/utf8.h
index ae41728..9abb916 100644
--- a/src/libjin/Common/utf8.h
+++ b/src/libjin/Common/utf8.h
@@ -1,7 +1,7 @@
#ifndef __LIBJIN_COMMON_UTF8_H
#define __LIBJIN_COMMON_UTF8_H
-#include "../jin_configuration.h"
+#include "../configuration.h"
#if LIBJIN_OS == LIBJIN_WINDOWS
#include <string>