From 6bbea150212f45e60499732c47424c34b50b2e3f Mon Sep 17 00:00:00 2001 From: SeonhyungLee Date: Tue, 20 Aug 2013 17:44:46 +0300 Subject: [PATCH] fix a build error upon window system Change-Id: I3fd344decfe5db9951cdf74e3ceb2034a5179052 --- src/ui-core/src/base/CMakeLists.txt | 6 +- src/ui-core/src/base/FBaseDouble.cpp | 6 +- src/ui-core/src/base/FBaseFloat.cpp | 6 +- src/ui-core/src/base/FBaseString.cpp | 7 + src/ui-core/src/base/FBaseSysLog.cpp | 12 + src/ui-core/src/base/inc/FBaseSysLog.h | 707 ++++++++++++++++++++++++++-- src/ui-core/src/graphics/FGrpBufferInfo.cpp | 2 +- 7 files changed, 714 insertions(+), 32 deletions(-) create mode 100644 src/ui-core/src/base/FBaseSysLog.cpp diff --git a/src/ui-core/src/base/CMakeLists.txt b/src/ui-core/src/base/CMakeLists.txt index b422e3c..8194b7f 100755 --- a/src/ui-core/src/base/CMakeLists.txt +++ b/src/ui-core/src/base/CMakeLists.txt @@ -13,6 +13,7 @@ SET (${this_target}_SOURCE_FILES FBaseErrors.cpp FBaseString.cpp FBaseStringComparer.cpp + FBaseSysLog.cpp FBaseDateTime.cpp FBaseTimeSpan.cpp FBaseBufferBase.cpp @@ -21,7 +22,6 @@ SET (${this_target}_SOURCE_FILES FBase_CharacterImpl.cpp FBaseDouble.cpp FBaseFloat.cpp - FBase_LocalizedNumParser.cpp runtime/FBaseRtMutex.cpp runtime/FBaseRtIEventListener.cpp runtime/FBaseRt_MutexImpl.cpp @@ -35,5 +35,7 @@ SET (${this_target}_SOURCE_FILES collection/FBaseColTypes.cpp ) +ADD_DEFINITIONS("-DBUILD_UI_CORE") + ## Create Library -ADD_LIBRARY (${this_target} STATIC ${${this_target}_SOURCE_FILES}) +ADD_LIBRARY(${this_target} STATIC ${${this_target}_SOURCE_FILES}) diff --git a/src/ui-core/src/base/FBaseDouble.cpp b/src/ui-core/src/base/FBaseDouble.cpp index 8aebf82..666c1c0 100644 --- a/src/ui-core/src/base/FBaseDouble.cpp +++ b/src/ui-core/src/base/FBaseDouble.cpp @@ -28,7 +28,6 @@ #include #include #include -#include "FBase_LocalizedNumParser.h" namespace Tizen { namespace Base { @@ -147,6 +146,7 @@ Double::GetHashCode(double val) result Double::Parse(const String& s, double& ret) { +#ifndef BUILD_UI_CORE double tmpRet = _LocalizedNumParser::ToDouble(s, ""); if (IsNaN(tmpRet)) @@ -157,6 +157,7 @@ Double::Parse(const String& s, double& ret) } ret = tmpRet; +#endif return E_SUCCESS; } @@ -211,7 +212,10 @@ Double::ToString(void) const String Double::ToString(double value) { +#ifndef BUILD_UI_CORE return _LocalizedNumParser::ToString(value, ""); +#endif + return String(); } long long diff --git a/src/ui-core/src/base/FBaseFloat.cpp b/src/ui-core/src/base/FBaseFloat.cpp index 0c17cd2..9ac8faf 100644 --- a/src/ui-core/src/base/FBaseFloat.cpp +++ b/src/ui-core/src/base/FBaseFloat.cpp @@ -28,7 +28,6 @@ #include #include #include -#include "FBase_LocalizedNumParser.h" namespace Tizen { namespace Base { @@ -141,6 +140,7 @@ Float::GetHashCode(float val) result Float::Parse(const String& s, float& ret) { +#ifndef BUILD_UI_CORE double tmpRet = _LocalizedNumParser::ToFloat(s, ""); if (IsNaN(tmpRet)) @@ -151,6 +151,7 @@ Float::Parse(const String& s, float& ret) } ret = tmpRet; +#endif return E_SUCCESS; } @@ -205,7 +206,10 @@ Float::ToString(void) const String Float::ToString(float value) { +#ifndef BUILD_UI_CORE return _LocalizedNumParser::ToString(value, ""); +#endif + return String(); } int diff --git a/src/ui-core/src/base/FBaseString.cpp b/src/ui-core/src/base/FBaseString.cpp index 4f1f896..4595cf9 100644 --- a/src/ui-core/src/base/FBaseString.cpp +++ b/src/ui-core/src/base/FBaseString.cpp @@ -481,6 +481,7 @@ String::Equals(const Object& obj) const bool String::Equals(const String& str, bool caseSensitive) const { +#ifndef BUILD_UI_CORE if (caseSensitive) { return(*this == str); @@ -504,11 +505,14 @@ String::Equals(const String& str, bool caseSensitive) const return false; } +#endif + return false; } result String::Format(int length, const wchar_t* pFormat, ...) { +#ifndef BUILD_UI_CORE int index = -1; result r = E_SUCCESS; @@ -559,6 +563,9 @@ String::Format(int length, const wchar_t* pFormat, ...) this->__hash = 0; return E_SUCCESS; +#endif + + return E_FAILURE; } int diff --git a/src/ui-core/src/base/FBaseSysLog.cpp b/src/ui-core/src/base/FBaseSysLog.cpp new file mode 100644 index 0000000..8b985c7 --- /dev/null +++ b/src/ui-core/src/base/FBaseSysLog.cpp @@ -0,0 +1,12 @@ +#include + +void SysLogInternal(unsigned long id, const char* pFunction, int lineNumber, const char* pFormat, ...){} +void SysLogExceptionInternal(unsigned long id, result r, const char* pFunction, int lineNumber, const char* pFormat, ...){} +void SysLogTagInternal(unsigned long id, const char* pTag, const char* pFunction, int lineNumber, const char* pFormat, ...){} +void SysLogExceptionTagInternal(unsigned long id, const char* pTag, result r, const char* pFunction, int lineNumber, const char* pFormat, ...){} +void SysAssertInternal(const char* pFileName, int lineNumber, const char* pFunction){} +void SysAssertfInternal(const char* expr, const char* pFunction, int lineNumber, const char* pFormat, ...){} +void SysPropagateInternal(const char* pFunction, int lineNumber, unsigned long nid, result r){} +void SysTryReturnResultInternal(unsigned long id, result r, const char* pFunction, int lineNumber, const char* pFormat, ...){} + + diff --git a/src/ui-core/src/base/inc/FBaseSysLog.h b/src/ui-core/src/base/inc/FBaseSysLog.h index 6b69cc9..0d50934 100644 --- a/src/ui-core/src/base/inc/FBaseSysLog.h +++ b/src/ui-core/src/base/inc/FBaseSysLog.h @@ -1,4 +1,5 @@ // +// Open Service Platform // Copyright (c) 2012 Samsung Electronics Co., Ltd. // // Licensed under the Apache License, Version 2.0 (the License); @@ -27,9 +28,6 @@ #include #include #include -#ifdef TEST -#include -#endif #ifdef __cplusplus extern "C" { @@ -42,38 +40,693 @@ extern "C" { #define unlikely(x) __builtin_expect(!!(x), 0) #endif +/** + * @mainpage Tizen Platform API Reference + * + * The Tizen platform API Reference provides descriptions of APIs for the platform developers. + */ + +/** + * @defgroup GroupMacros Debugging Macros + * + * This page describes Tizen debugging macros used by the Tizen modules. + * These debugging macros should use specific NID ( Namespace ID ) to distinguish each Tizen modules. + * + * @since 2.0 + */ + + +/** + * @addtogroup GroupMacros + * + * @{ + */ + +/** + * This macro allows display of informative log messages. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysLog macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * SysLog(NID, "Initialization successful."); + * + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysLog(NID, ...) SysLogInternal(NID, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) + +/** + * This macro allows display of exception log messages with a tag and sets the last result. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysLogException macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * if (something_wrong) // The Try family macros can be used instead. + * { + * SysLogException(NID, E_INVALID_ARG, "An unexpected error has occurred."); + * + * return false; + * } + * //... + * + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysLogException(NID, r, ...) SysLogExceptionInternal(NID, r, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) + +/** + * This macro allows display of informative log messages with a tag. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] tag The user defined tag + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysLogTag macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * SysLogTag(NID, "MyTag", "Initialization successful."); + * + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysLogTag(NID, tag, ...) SysLogTagInternal(NID, tag, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) -#define SysLog(NID, ...) -#define SysLogException(NID, r, ...) -#define SysLogTag(NID, tag, ...) -#define SysLogExceptionTag(NID, tag, r, ...) -#define SysTryLog(NID, condition, ...) -#define SysTryLogCatch(NID, condition, expr, ...) -#define SysTryLogReturn(NID, condition, returnValue, ...) -#define SysTryReturn(NID, condition, returnValue, r, ...) -#define SysTryReturnResult(NID, condition, r, ...) -#define SysTryReturnVoidResult(NID, condition, r, ...) -#define SysTryCatch(NID, condition, expr, r, ...) -#define SysTryCatchLabel(NID, condition, expr, catchLabel, r, ...) -#define SysAssert(condition) -#define SysAssertf(condition, ...) -#define SysStaticAssert(condition) -#define SysPropagate(NID, r) +/** + * This macro allows display of exception log messages with a tag and sets the last result. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] tag The user defined tag + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysLogTagException macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * SysLogExceptionTag(NID, "MyTag", E_INVALID_ARG, "Initialization successful."); + * + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysLogExceptionTag(NID, tag, r, ...) SysLogExceptionTagInternal(NID, tag, r, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) + + + +/** + * This macro allows display of informative log message with a tag, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryLog macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryLog(NID, condition, "An unexpected error has occurred."); + * + * //... + * } + * @endcode + * @hideinitializer + */ +#define SysTryLog(NID, condition, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLog(NID, __VA_ARGS__); \ + } \ + } while (0); + +/** + * This macro allows display of informative log message, when the condition is @c false. + * Executes statements and goes to label. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] expr Expressions that are evaluated before going to CATCH label + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryLogCatch macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryLogCatch(NID, condition, r=E_INVALID_ARG, "An unexpected error has occurred."); + * + * //... + * CATCH: + * return false; + * } + * @endcode + * @hideinitializer + */ +#define SysTryLogCatch(NID, condition, expr, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLog(NID, __VA_ARGS__); \ + expr; \ + goto CATCH; \ + } \ + } while (0); + +/** + * This macro allows display of informative log message and returns returnValue, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] returnValue The value to return when the condition is @c false + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryLogReturn macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryLogReturn(NID, condition, false, "An unexpected error has occurred."); + * + * //... + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysTryLogReturn(NID, condition, returnValue, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLog(NID, __VA_ARGS__); \ + return returnValue; \ + } \ + } while (0); + + +/** + * This macro allows display of exception log message with a tag and sets the last result, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] returnValue The value to return when the condition is @c false + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryReturn macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryReturn(NID, condition, false, E_INVALID_ARG, "An unexpected error has occurred."); + * + * //... + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysTryReturn(NID, condition, returnValue, r, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLogException(NID, r, __VA_ARGS__); \ + return returnValue; \ + } \ + } while (0); + +/** + * This macro allows display of exception log message with a tag and sets the last result, when the condition is @c false. + * This is a shorthand macro for SysTryReturn(NID, condition, r, r, "[" # r "] " ...). + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryReturnResult macro. + * + * @code + * #define E_UNKNOWN_ERROR 1 + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryReturnResult(NID, condition, E_UNKNOWN_ERROR, "An unexpected error has occurred."); + * + * //... + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysTryReturnResult(NID, condition, r, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysTryReturnResultInternal(NID, r, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__); \ + return r; \ + } \ + } while (0); + +/** + * This macro allows display of exception log message with a tag and sets the last result, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryReturnVoidResult macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryReturnVoidResult(NID, condition, E_INVALID_ARG, "An unexpected error has occurred."); + * + * //... + * return true; + * } + * @endcode + * @hideinitializer + */ +#define SysTryReturnVoidResult(NID, condition, r, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLogException(NID, r, __VA_ARGS__); \ + return; \ + } \ + } while (0); + +/** + * This macro allows display of exception log message with a tag, when the condition is @c false. + * Executes statements, sets the last result and goes to label. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] expr Expressions that are evaluated before going to CATCH label + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryCatch macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryCatch(NID, condition, r=E_INVALID_ARG, E_INVALID_ARG, "An unexpected error has occurred."); + * + * //... + * CATCH: + * return false; + * } + * @endcode + * @hideinitializer + */ +#define SysTryCatch(NID, condition, expr, r, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLogException(NID, r, __VA_ARGS__); \ + expr; \ + goto CATCH; \ + } \ + } while (0); + +/** + * This macro allows display of exception log message with a tag, when the condition is @c false. + * Executes statements, sets the last result and goes to label. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] condition The condition that is expected to be true + * @param[in] expr Expressions that are evaluated before going to catchLabel label + * @param[in] catchLabel The label for goto operation + * @param[in] r The last result to set + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysTryCatchLabel macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysTryCatchLabel(NID, condition, r=E_INVALID_ARG, LABEL, E_INVALID_ARG, "An unexpected error has occurred."); + * + * //... + * LABEL: + * return false; + * } + * @endcode + * @hideinitializer + */ +#define SysTryCatchLabel(NID, condition, expr, catchLabel, r, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysLogException(NID, r, __VA_ARGS__); \ + expr; \ + goto catchLabel; \ + } \ + } while (0); + + +/** + * This macro allows display of exception log message and the program will expire, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] condition The condition that is expected to be true + * + * The following example demonstrates how to use the SysAssert macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysAssert(condition); + * + * //... + * } + * @endcode + * @hideinitializer + */ +#define SysAssert(condition) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysAssertInternal(__FILE__, __LINE__, __PRETTY_FUNCTION__); \ + } \ + } while (0); + +/** + * This macro allows display of exception log message with a tag and the program will expire, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] condition The condition that is expected to be true + * @param[in] ... The message to display + * + * The following example demonstrates how to use the SysAssertf macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysAssertf(condition, ""); + * + * //... + * } + * @endcode + * @hideinitializer + */ +#define SysAssertf(condition, ...) \ + do \ + { \ + if (unlikely(!(condition))) { \ + SysAssertfInternal(# condition, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__); \ + } \ + } while (0); + + +/** + * This macro generates an error message during compile time, when the condition is @c false. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] condition The condition that is expected to be true + * + * The following example demonstrates how to use the SysStaticAssert macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysStaticAssert(condition); + * + * //... + * } + * @endcode + * @hideinitializer + */ +#define SysStaticAssert(condition) switch (0) { \ +case 0: \ +case condition: \ + ; \ +} + + +/** + * This macro allows display of exception log messages. + * This system log macro is for the platform modules. + * + * @since 2.0 + * + * @param[in] NID The Tizen namespace + * @param[in] r The last result to set + * + * The following example demonstrates how to use the SysPropagate macro. + * + * @code + * bool + * MyEngine::Init(int value) + * { + * //... + * + * SysPropagate(NID, E_INVALID_ARG); + * + * //... + * } + * @endcode + * @hideinitializer + */ +#define SysPropagate(NID, r) SysPropagateInternal(__PRETTY_FUNCTION__, __LINE__, NID, r) + +// Secure Macros +#if defined(_SECURE_LOG) + +#define SysSecureLog(NID, ...) SysLogInternal(NID, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) +#define SysSecureLogException(NID, r,...) SysLogExceptionInternal(NID, r, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) + +#define SysSecureLogTag(NID, tag, ...) SysLogTagInternal(NID, tag, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) +#define SysSecureLogExceptionTag(NID, tag, r, ...) SysLogExceptionTagInternal(NID, tag, r, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) + +#else + +/** +* This macro is to protect informative log messages which needs to keep security. +* It allows display of informative log messages if compiled with "_SECURE_LOG" definition. +* Otherwise, it will be removed in the compile time. +* This system log macro is for the platform modules. +* +* @since 2.1 +* +* @param[in] NID The Tizen namespace ID +* @param[in] ... The message to display +* +* The following example demonstrates how to use the SysSecureLog macro. +* +* @code +* bool +* MyEngine::Init(int value) +* { +* SysSecureLog(NID, "User ID : 'JoneDoe'"); +* +* return true; +* } +* @endcode +* @hideinitializer +*/ #define SysSecureLog(NID, ...) + +/** +* This macro is to protect exception log messages which needs to keep security, and sets the last result. +* It allows display of exception log messages if compiled with "_SECURE_LOG" definition. +* Otherwise, it will be removed in the compile time. +* This system log macro is for the platform modules. +* +* @since 2.1 +* +* @param[in] NID The Tizen namespace ID +* @param[in] r The last result to set +* @param[in] ... The message to display +* +* The following example demonstrates how to use the SysSecureLogException macro. +* +* @code +* bool +* MyEngine::Init(int value) +* { +* //... +* if (something_wrong) +* { +* SysSecureLogException(NID, E_INVALID_ARG, "User ID : 'JoneDoe' mismatch."); +* +* return false; +* } +* //... +* +* return true; +* } +* @endcode +* @hideinitializer +*/ #define SysSecureLogException(NID, r,...) + +/** +* This macro is to protect informative log messages which needs to keep security, with a tag. +* It allows display of informative log messages if compiled with "_SECURE_LOG" definition. +* Otherwise, it will be removed in the compile time. +* This system log macro is for the platform modules. +* +* @since 2.1 +* +* @param[in] NID The Tizen namespace ID +* @param[in] tag The user defined tag +* @param[in] ... The message to display +* +* The following example demonstrates how to use the SysSecureLogTag macro. +* +* @code +* bool +* MyEngine::Init(int value) +* { +* SysSecureLogTag(NID, "MyTag", "User ID : 'JoneDoe'"); +* +* return true; +* } +* @endcode +* @hideinitializer +*/ #define SysSecureLogTag(NID, tag, ...) + +/** +* This macro is to protect exception log messages which needs to keep security, with a tag and sets the last result. +* It allows display of exception log messages if compiled with "_SECURE_LOG" definition. +* Otherwise, it will be removed in the compile time. +* This system log macro is for the platform modules. +* +* @since 2.1 +* +* @param[in] NID The Tizen namespace ID +* @param[in] tag The user defined tag +* @param[in] r The last result to set +* @param[in] ... The message to display +* +* The following example demonstrates how to use the SysSecureLogExceptionTag macro. +* +* @code +* bool +* MyEngine::Init(int value) +* { +* SysSecureLogExceptionTag(NID, "MyTag", E_INVALID_ARG, "User ID : 'JoneDoe' mismatch."); +* +* return true; +* } +* @endcode +* @hideinitializer +*/ #define SysSecureLogExceptionTag(NID, tag, r, ...) -#define SysSecureTryLog(NID, condition, ...) -#define SysSecureTryLogCatch(NID, condition, expr, ...) -#define SysSecureTryLogReturn(NID, condition, returnValue, ...) -#define SysSecureTryReturn(NID, condition, returnValue, r, ...) -#define SysSecureTryReturnResult(NID, condition, r, ...) -#define SysSecureTryReturnVoidResult(NID, condition, r, ...) -#define SysSecureTryCatch(NID, condition, expr, r, ...) -#define SysSecureTryCatchLabel(NID, condition, expr, catchLabel, r, ...) +#endif + +/** + * Defines the log ID. + */ enum LogID { +//Tizen Namespace ID =============================================================== NID_APP = 0, NID_BASE = 10, diff --git a/src/ui-core/src/graphics/FGrpBufferInfo.cpp b/src/ui-core/src/graphics/FGrpBufferInfo.cpp index 278b33e..71797a1 100644 --- a/src/ui-core/src/graphics/FGrpBufferInfo.cpp +++ b/src/ui-core/src/graphics/FGrpBufferInfo.cpp @@ -24,7 +24,7 @@ #include #include - +#include #include #include "FGrp_BufferInfoImpl.h" -- 2.7.4