Remove C++ template declarance from C linkage

Change-Id: I8c6655f1adff33300619218a86f5ac146949affb
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/tappsd/inc/drm_intf_tapps.h b/tappsd/inc/drm_intf_tapps.h
index e86df0c..bcaa94f 100644 (file)
--- a/tappsd/inc/drm_intf_tapps.h
+++ b/tappsd/inc/drm_intf_tapps.h
@@ -147,33 +147,6 @@ typedef enum {
 }
 
 /*************************************************************************************************************/
-
-/* New and Delete */
-
-#include <new>
-#define NEW new (std::nothrow)
-
-#define MDELETE(x) \
-{                  \
-       if (x) {       \
-               delete x;  \
-               x=0;       \
-       }              \
-}
-
-#define MDELETES(x)  \
-{                    \
-       if (x) {         \
-               delete [] x; \
-               x=0;         \
-       }                \
-}
-
-#define MDELETE0 MDELETE
-
-#define MDELETES0 MDELETES
-
-/*************************************************************************************************************/
 /* Mutex structure */
 typedef pthread_mutex_t dtapps_mutex_t;
 

diff --git a/tappsd/src/db/DTapps2SqliteDB.cpp b/tappsd/src/db/DTapps2SqliteDB.cpp
index 4789f07..e06b4ac 100644 (file)
--- a/tappsd/src/db/DTapps2SqliteDB.cpp
+++ b/tappsd/src/db/DTapps2SqliteDB.cpp
@@ -114,7 +114,7 @@ BOOL DTappsDBOpen(void *&pDb, const char* CallingFun)
        else
        {
                DRM_TAPPS_LOG("no connection exists.. pairCount=[%ld]", pairCount);
-               pDBConnectionInfo = NEW DtappsDBConnectionInfo;
+               pDBConnectionInfo = new(std::nothrow) DtappsDBConnectionInfo;
                MTRY_BL(NULL != pDBConnectionInfo);
                IsMemAllocated = true;   // prevent fix
 
@@ -147,10 +147,9 @@ BOOL DTappsDBOpen(void *&pDb, const char* CallingFun)
 
 MCATCH_B
 
-       if (true == IsMemAllocated)
-       {
-               MDELETE(pDBConnectionInfo);
-       }
+       if (IsMemAllocated && pDBConnectionInfo)
+               delete pDBConnectionInfo;
+
        DRM_TAPPS_EXCEPTION("This fn fails");
 
        return FALSE;