Skip to content

Commit cf3b750

Browse files
committed
Minor code formating changes & comments
1 parent 4bb70c1 commit cf3b750

File tree

15 files changed

+247
-260
lines changed

15 files changed

+247
-260
lines changed

CHANGELOG.md

Lines changed: 230 additions & 230 deletions
Large diffs are not rendered by default.

build.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ cmake --build .
1818
ctest --output-on-failure
1919
@if ERRORLEVEL 1 goto onError
2020

21-
goto onSuccess
21+
@goto onSuccess
2222

2323
:onError
2424
@echo An error occured!
2525
:onSuccess
26-
cd ..
26+
@cd ..

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010
mkdir -p build
1111
cd build
1212

13-
# Generate a Makefile for GCC (or Clang, depanding on CC/CXX envvar)
13+
# Generate a Makefile for GCC (or Clang, depending on CC/CXX envvar)
1414
cmake -DCMAKE_BUILD_TYPE=Debug -DSQLITECPP_USE_ASAN=ON -DSQLITECPP_USE_GCOV=OFF -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON ..
1515

1616
# Build (ie 'make')

include/SQLiteCpp/Assertion.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include <cassert>
1414

15-
1615
/**
1716
* SQLITECPP_ASSERT SQLITECPP_ASSERT() is used in destructors, where exceptions shall not be thrown
1817
*
@@ -25,16 +24,18 @@
2524
// if an assert handler is provided by user code, use it instead of assert()
2625
namespace SQLite
2726
{
28-
// declaration of the assert handler to define in user code
29-
void assertion_failed(const char* apFile, const int apLine, const char* apFunc,
30-
const char* apExpr, const char* apMsg);
27+
28+
// declaration of the assert handler to define in user code
29+
void assertion_failed(const char* apFile, const int apLine, const char* apFunc,
30+
const char* apExpr, const char* apMsg);
3131

3232
#ifdef _MSC_VER
3333
#define __func__ __FUNCTION__
3434
#endif
3535
// call the assert handler provided by user code
3636
#define SQLITECPP_ASSERT(expression, message) \
3737
if (!(expression)) SQLite::assertion_failed(__FILE__, __LINE__, __func__, #expression, message)
38+
3839
} // namespace SQLite
3940

4041
#else

include/SQLiteCpp/Backup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class SQLITECPP_API Backup
125125
void operator()(sqlite3_backup* apBackup);
126126
};
127127

128-
std::unique_ptr<sqlite3_backup, Deleter> mpSQLiteBackup{}; ///< Pointer to SQLite Database Backup Handle
128+
std::unique_ptr<sqlite3_backup, Deleter> mpSQLiteBackup; ///< Pointer to SQLite Database Backup Handle
129129
};
130130

131131
} // namespace SQLite

include/SQLiteCpp/Column.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ class SQLITECPP_API Column
228228
}
229229

230230
private:
231-
Statement::TStatementPtr mStmtPtr; ///< Shared Pointer to the prepared SQLite Statement Object
232-
int mIndex; ///< Index of the column in the row of result, starting at 0
231+
Statement::TStatementPtr mStmtPtr; ///< Shared Pointer to the prepared SQLite Statement Object
232+
int mIndex; ///< Index of the column in the row of result, starting at 0
233233
};
234234

235235
/**

include/SQLiteCpp/Database.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ SQLITECPP_API extern const int OPEN_NOFOLLOW; // SQLITE_OPEN_NOFOLLOW
109109

110110
SQLITECPP_API extern const int OK; ///< SQLITE_OK (used by check() bellow)
111111

112-
SQLITECPP_API extern const char* const VERSION; ///< SQLITE_VERSION string from the sqlite3.h used at compile time
113-
SQLITECPP_API extern const int VERSION_NUMBER; ///< SQLITE_VERSION_NUMBER from the sqlite3.h used at compile time
112+
SQLITECPP_API extern const char* const VERSION; ///< SQLITE_VERSION string from sqlite3.h used at compile time
113+
SQLITECPP_API extern const int VERSION_NUMBER; ///< SQLITE_VERSION_NUMBER from sqlite3.h used at compile time
114114

115115
/// Return SQLite version string using runtime call to the compiled library
116116
SQLITECPP_API const char* getLibVersion() noexcept;
@@ -617,9 +617,8 @@ class SQLITECPP_API Database
617617

618618
private:
619619
// TODO: perhaps switch to having Statement sharing a pointer to the Connexion
620-
std::unique_ptr<sqlite3, Deleter> mSQLitePtr; ///< Pointer to SQLite Database Connection Handle
621-
std::string mFilename; ///< UTF-8 filename used to open the database
620+
std::unique_ptr<sqlite3, Deleter> mSQLitePtr; ///< Pointer to SQLite Database Connection Handle
621+
std::string mFilename; ///< UTF-8 filename used to open the database
622622
};
623623

624-
625624
} // namespace SQLite

include/SQLiteCpp/Exception.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ struct sqlite3;
2020
namespace SQLite
2121
{
2222

23-
2423
/**
2524
* @brief Encapsulation of the error message from SQLite3, based on std::runtime_error.
2625
*/
@@ -89,5 +88,4 @@ class SQLITECPP_API Exception : public std::runtime_error
8988
int mExtendedErrcode; ///< Detailed error code if any
9089
};
9190

92-
9391
} // namespace SQLite

include/SQLiteCpp/ExecuteMany.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
namespace SQLite
2525
{
26+
2627
/// @endcond
2728

2829
/**

include/SQLiteCpp/Statement.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
struct sqlite3;
2323
struct sqlite3_stmt;
2424

25-
2625
namespace SQLite
2726
{
2827

29-
3028
// Forward declaration
3129
class Database;
3230
class Column;
@@ -710,5 +708,4 @@ class SQLITECPP_API Statement
710708
mutable std::map<std::string, int> mColumnNames;
711709
};
712710

713-
714711
} // namespace SQLite

0 commit comments

Comments
 (0)