From 392c4e7c42c000d82e641a3d04f0d2a01f0aca21 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 18 Oct 2018 08:03:04 +0800 Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Common/Singleton.hpp | 2 +- src/libjin/Common/Subsystem.hpp | 2 +- src/libjin/Common/utf8.cpp | 2 +- src/libjin/Common/utf8.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libjin/Common') 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 T* Singleton::_instance = nullptr; -#define SINGLETON(T) friend Singleton +#define singleton(T) friend Singleton } // 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 -- cgit v1.1-26-g67d0