projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add codes for Dali Windows Backend"
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
common
/
dali-common.h
diff --git
a/dali/public-api/common/dali-common.h
b/dali/public-api/common/dali-common.h
old mode 100644
(file)
new mode 100755
(executable)
index
7e2ba29
..
4b7c4aa
--- a/
dali/public-api/common/dali-common.h
+++ b/
dali/public-api/common/dali-common.h
@@
-2,7
+2,7
@@
#define __DALI_COMMON_H__
/*
#define __DALI_COMMON_H__
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,10
+20,6
@@
// EXTERNAL INCLUDES
// EXTERNAL INCLUDES
-#ifdef EMSCRIPTEN
-#include <emscripten/emscripten.h>
-#endif
-
/*
* Definitions for shared library support.
*
/*
* Definitions for shared library support.
*
@@
-38,10
+34,12
@@
# ifndef HIDE_DALI_INTERNALS
# define DALI_EXPORT_API
# define DALI_IMPORT_API
# ifndef HIDE_DALI_INTERNALS
# define DALI_EXPORT_API
# define DALI_IMPORT_API
+# define DALI_CORE_API
# define DALI_INTERNAL
# else
# define DALI_EXPORT_API __attribute__ ((visibility ("default")))
# define DALI_IMPORT_API __attribute__ ((visibility ("default")))
# define DALI_INTERNAL
# else
# define DALI_EXPORT_API __attribute__ ((visibility ("default")))
# define DALI_IMPORT_API __attribute__ ((visibility ("default")))
+# define DALI_CORE_API __attribute__ ((visibility ("default")))
# define DALI_INTERNAL __attribute__ ((visibility ("hidden")))
# endif
#else
# define DALI_INTERNAL __attribute__ ((visibility ("hidden")))
# endif
#else
@@
-49,6
+47,8
@@
# define DALI_EXPORT_API
/** Visibility attribute to show declarations */
# define DALI_IMPORT_API
# define DALI_EXPORT_API
/** Visibility attribute to show declarations */
# define DALI_IMPORT_API
+/** Visibility attribute to show declarations */
+# define DALI_CORE_API
/** Visibility attribute to hide declarations */
# define DALI_INTERNAL
#endif
/** Visibility attribute to hide declarations */
# define DALI_INTERNAL
#endif
@@
-66,21
+66,6
@@
// C++0x not supported
#endif
// C++0x not supported
#endif
-#ifdef EMSCRIPTEN
-
-#ifndef __clang__
-# error not clang?
-#endif
-
-// clang cpp11 check is per feature
-#if !__has_feature(cxx_constexpr)
-# error constexpr needed for compile-time-math. Use -std=c+11
-#endif
-
-#define _CPP11
-
-#endif
-
/**
* @brief Two macros to provide branch predictor information.
* DALI_LIKELY should be used when a branch is taken in almost all cases so the
/**
* @brief Two macros to provide branch predictor information.
* DALI_LIKELY should be used when a branch is taken in almost all cases so the
@@
-109,13
+94,13
@@
namespace Dali
* @param[in] location Where the assertion occurred
* @param[in] condition The assertion condition
*/
* @param[in] location Where the assertion occurred
* @param[in] condition The assertion condition
*/
-DALI_
IMPORT
_API void DaliAssertMessage( const char* location, const char* condition );
+DALI_
CORE
_API void DaliAssertMessage( const char* location, const char* condition );
/**
* @brief Exception class for Dali Core library - Raised by assertions in codebase.
* @SINCE_1_0.0
*/
/**
* @brief Exception class for Dali Core library - Raised by assertions in codebase.
* @SINCE_1_0.0
*/
-class DALI_
IMPORT
_API DaliException
+class DALI_
CORE
_API DaliException
{
public:
/**
{
public:
/**
@@
-170,24
+155,12
@@
public:
#define ASSERT_LOCATION NULL
#endif
#define ASSERT_LOCATION NULL
#endif
-#ifdef EMSCRIPTEN
-
#define DALI_ASSERT_ALWAYS(cond) \
if(DALI_UNLIKELY(!(cond))) \
{ \
Dali::DaliAssertMessage( ASSERT_LOCATION, #cond ); \
throw Dali::DaliException( ASSERT_LOCATION, #cond ); \
#define DALI_ASSERT_ALWAYS(cond) \
if(DALI_UNLIKELY(!(cond))) \
{ \
Dali::DaliAssertMessage( ASSERT_LOCATION, #cond ); \
throw Dali::DaliException( ASSERT_LOCATION, #cond ); \
- EM_ASM(print(new Error().stack)); \
}
}
-#else
-
-#define DALI_ASSERT_ALWAYS(cond) \
- if(DALI_UNLIKELY(!(cond))) \
- { \
- Dali::DaliAssertMessage( ASSERT_LOCATION, #cond ); \
- throw Dali::DaliException( ASSERT_LOCATION, #cond ); \
- }
-#endif
#define DALI_ABORT(message) \
{ \
#define DALI_ABORT(message) \
{ \