From 48ac91d173a79d34ae9325bd1547055cc39380bd Mon Sep 17 00:00:00 2001 From: BeniS Date: Mon, 4 Mar 2013 01:27:07 +1300 Subject: [PATCH] A few clean ups and also tested, its working fine --- src/framework/sql/database.h | 2 +- src/framework/sql/declarations.h | 2 +- src/framework/sql/mysql.cpp | 2 -- src/framework/sql/mysql.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/framework/sql/database.h b/src/framework/sql/database.h index 8161cdd5..9b189877 100644 --- a/src/framework/sql/database.h +++ b/src/framework/sql/database.h @@ -239,7 +239,7 @@ class DBInsert /** * Associates with given database handler. * - * @param Database* database wrapper + * @param DatabasePtr database wrapper */ DBInsert(DatabasePtr db): m_db(db), m_rows(0) {} ~DBInsert() {} diff --git a/src/framework/sql/declarations.h b/src/framework/sql/declarations.h index 8111389a..9df1d34f 100644 --- a/src/framework/sql/declarations.h +++ b/src/framework/sql/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sql/mysql.cpp b/src/framework/sql/mysql.cpp index 7d6164ac..2d127f20 100644 --- a/src/framework/sql/mysql.cpp +++ b/src/framework/sql/mysql.cpp @@ -253,8 +253,6 @@ void MySQLResult::free() } mysql_free_result(m_resultHandle); - - delete m_resultHandle; m_resultHandle = NULL; } diff --git a/src/framework/sql/mysql.h b/src/framework/sql/mysql.h index 74c57875..5a90a207 100644 --- a/src/framework/sql/mysql.h +++ b/src/framework/sql/mysql.h @@ -20,8 +20,8 @@ * THE SOFTWARE. */ -#ifndef __DATABASE_MYSQL__ -#define __DATABASE_MYSQL__ +#ifndef DATABASEMYSQL_H +#define DATABASEMYSQL_H #include "database.h"