aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odb/exceptions.cxx2
-rw-r--r--odb/exceptions.hxx2
-rw-r--r--odb/transaction.cxx16
-rw-r--r--odb/transaction.hxx4
4 files changed, 12 insertions, 12 deletions
diff --git a/odb/exceptions.cxx b/odb/exceptions.cxx
index 597f40d..c480125 100644
--- a/odb/exceptions.cxx
+++ b/odb/exceptions.cxx
@@ -19,7 +19,7 @@ namespace odb
return "operation can only be performed in transaction";
}
- const char* transaction_already_finilized::
+ const char* transaction_already_finalized::
what () const throw ()
{
return "transaction already committed or rolled back";
diff --git a/odb/exceptions.hxx b/odb/exceptions.hxx
index 8c0fe27..91fa5ab 100644
--- a/odb/exceptions.hxx
+++ b/odb/exceptions.hxx
@@ -26,7 +26,7 @@ namespace odb
what () const throw ();
};
- struct LIBODB_EXPORT transaction_already_finilized: odb::exception
+ struct LIBODB_EXPORT transaction_already_finalized: odb::exception
{
virtual const char*
what () const throw ();
diff --git a/odb/transaction.cxx b/odb/transaction.cxx
index f9883b6..313c625 100644
--- a/odb/transaction.cxx
+++ b/odb/transaction.cxx
@@ -20,7 +20,7 @@ namespace odb
transaction::
transaction (transaction_impl* impl)
- : finilized_ (false), impl_ (impl)
+ : finalized_ (false), impl_ (impl)
{
tls_set (current_transaction, this);
}
@@ -28,7 +28,7 @@ namespace odb
transaction::
~transaction ()
{
- if (!finilized_)
+ if (!finalized_)
{
try
{
@@ -62,10 +62,10 @@ namespace odb
void transaction::
commit ()
{
- if (finilized_)
- throw transaction_already_finilized ();
+ if (finalized_)
+ throw transaction_already_finalized ();
- finilized_ = true;
+ finalized_ = true;
tls_set<transaction> (current_transaction, 0);
impl_->commit ();
}
@@ -73,10 +73,10 @@ namespace odb
void transaction::
rollback ()
{
- if (finilized_)
- throw transaction_already_finilized ();
+ if (finalized_)
+ throw transaction_already_finalized ();
- finilized_ = true;
+ finalized_ = true;
tls_set<transaction> (current_transaction, 0);
impl_->rollback ();
}
diff --git a/odb/transaction.hxx b/odb/transaction.hxx
index 71d17eb..a069209 100644
--- a/odb/transaction.hxx
+++ b/odb/transaction.hxx
@@ -24,7 +24,7 @@ namespace odb
explicit
transaction (transaction_impl*);
- // Unless the transaction has already been finilized (explicitly
+ // Unless the transaction has already been finalized (explicitly
// committed or rolled back), the destructor will roll it back.
//
~transaction ();
@@ -62,7 +62,7 @@ namespace odb
transaction& operator= (const transaction&);
protected:
- bool finilized_;
+ bool finalized_;
transaction_impl* impl_;
};