diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 15:34:28 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 15:34:28 +0100 |
| commit | c70c6d19c1cabf46b595591802bceab63d371788 (patch) | |
| tree | 1c153d2bfe560171bad5889d528dc5cf110e8533 /src/dal/recordset.cpp | |
| parent | d707495540581f8c1b9ab3d5007c9c4d1ab83b53 (diff) | |
| parent | 587b7682e6bf7dd9e616c1d4789a5ed9aa986e6d (diff) | |
| download | manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.gz manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.bz2 manaserv-c70c6d19c1cabf46b595591802bceab63d371788.tar.xz manaserv-c70c6d19c1cabf46b595591802bceab63d371788.zip | |
Merge branch 'master' into lpc2012
Conflicts:
gameserver.cbp
src/account-server/accounthandler.cpp
src/game-server/attack.cpp
src/game-server/attack.h
src/game-server/being.cpp
src/game-server/being.h
src/game-server/character.cpp
src/game-server/character.h
src/game-server/inventory.cpp
src/game-server/item.h
src/game-server/monster.cpp
src/game-server/monster.h
Diffstat (limited to 'src/dal/recordset.cpp')
| -rw-r--r-- | src/dal/recordset.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dal/recordset.cpp b/src/dal/recordset.cpp index 065bbd77..0529325f 100644 --- a/src/dal/recordset.cpp +++ b/src/dal/recordset.cpp @@ -61,7 +61,7 @@ bool RecordSet::isEmpty() const * * @return the number of rows. */ -unsigned int RecordSet::rows() const +unsigned RecordSet::rows() const { return mRows.size(); } @@ -71,7 +71,7 @@ unsigned int RecordSet::rows() const * * @return the number of columns. */ -unsigned int RecordSet::cols() const +unsigned RecordSet::cols() const { return mHeaders.size(); } @@ -93,7 +93,7 @@ void RecordSet::setColumnHeaders(const Row &headers) */ void RecordSet::add(const Row &row) { - const unsigned int nCols = mHeaders.size(); + const unsigned nCols = mHeaders.size(); if (nCols == 0) { throw RsColumnHeadersNotSet(); @@ -110,8 +110,8 @@ void RecordSet::add(const Row &row) mRows.push_back(row); } -const std::string &RecordSet::operator()(const unsigned int row, - const unsigned int col) const +const std::string &RecordSet::operator()(const unsigned row, + const unsigned col) const { if ((row >= mRows.size()) || (col >= mHeaders.size())) { std::ostringstream os; @@ -125,7 +125,7 @@ const std::string &RecordSet::operator()(const unsigned int row, return mRows[row][col]; } -const std::string &RecordSet::operator()(const unsigned int row, +const std::string &RecordSet::operator()(const unsigned row, const std::string& name) const { if (row >= mRows.size()) { @@ -147,8 +147,8 @@ const std::string &RecordSet::operator()(const unsigned int row, } // find the field index. - const unsigned int nCols = mHeaders.size(); - unsigned int i; + const unsigned nCols = mHeaders.size(); + unsigned i; for (i = 0; i < nCols; ++i) { if (mHeaders[i] == name) { break; |