aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-11-29 09:05:52 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-11-29 09:05:52 +0200
commitc56597d22eb4ab16ea482b92b8a5ba0f079f890f (patch)
tree6b0b2dc25e6d5380fef3c2036d78e7022b4c06b2
parentb12e076d8232dd2c757fa41685205f9c610114fc (diff)
Remove unused indicator arrays from view/container statements
-rw-r--r--odb/oracle/container-statements.hxx18
-rw-r--r--odb/oracle/container-statements.txx17
-rw-r--r--odb/oracle/object-statements.hxx1
-rw-r--r--odb/oracle/view-statements.hxx7
-rw-r--r--odb/oracle/view-statements.txx5
5 files changed, 0 insertions, 48 deletions
diff --git a/odb/oracle/container-statements.hxx b/odb/oracle/container-statements.hxx
index bc929a4..61febef 100644
--- a/odb/oracle/container-statements.hxx
+++ b/odb/oracle/container-statements.hxx
@@ -15,7 +15,6 @@
#include <odb/oracle/version.hxx>
#include <odb/oracle/oracle-types.hxx>
-#include <odb/oracle/oracle-fwd.hxx> // sb2
#include <odb/oracle/statement.hxx>
#include <odb/oracle/details/export.hxx>
@@ -114,12 +113,6 @@ namespace odb
return cond_image_binding_;
}
- sb2*
- cond_image_indicator ()
- {
- return cond_image_indicator_;
- }
-
// Data image.
//
data_image_type&
@@ -158,12 +151,6 @@ namespace odb
return data_image_binding_;
}
- sb2*
- data_image_indicator ()
- {
- return data_image_indicator_;
- }
-
//
// Statements.
//
@@ -223,14 +210,12 @@ namespace odb
std::size_t cond_id_binding_version_;
binding cond_image_binding_;
bind* cond_image_bind_;
- sb2* cond_image_indicator_;
data_image_type data_image_;
std::size_t data_image_version_;
std::size_t data_id_binding_version_;
binding data_image_binding_;
bind* data_image_bind_;
- sb2* data_image_indicator_;
const char* insert_one_text_;
const char* select_all_text_;
@@ -259,10 +244,7 @@ namespace odb
private:
bind cond_image_bind_array_[traits::cond_column_count];
- sb2 cond_image_indicator_array_[traits::cond_column_count];
-
bind data_image_bind_array_[traits::data_column_count];
- sb2 data_image_indicator_array_[traits::data_column_count];
};
}
}
diff --git a/odb/oracle/container-statements.txx b/odb/oracle/container-statements.txx
index aae3550..c296eec 100644
--- a/odb/oracle/container-statements.txx
+++ b/odb/oracle/container-statements.txx
@@ -3,7 +3,6 @@
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : ODB NCUEL; see accompanying LICENSE file
-#include <cstddef> // std::size_t
#include <cstring> // std::memset
namespace odb
@@ -40,10 +39,7 @@ namespace odb
: base (conn)
{
this->cond_image_bind_ = cond_image_bind_array_;
- this->cond_image_indicator_ = cond_image_indicator_array_;
-
this->data_image_bind_ = data_image_bind_array_;
- this->data_image_indicator_ = data_image_indicator_array_;
this->cond_image_binding_.bind = this->cond_image_bind_;
this->cond_image_binding_.count = traits::cond_column_count;
@@ -52,20 +48,7 @@ namespace odb
this->data_image_binding_.count = traits::data_column_count;
std::memset (cond_image_bind_array_, 0, sizeof (cond_image_bind_array_));
- std::memset (cond_image_indicator_array_,
- 0,
- sizeof (cond_image_indicator_array_));
-
- for (std::size_t i (0); i < traits::cond_column_count; ++i)
- cond_image_bind_array_[i].indicator = cond_image_indicator_array_ + i;
-
std::memset (data_image_bind_array_, 0, sizeof (data_image_bind_array_));
- std::memset (data_image_indicator_array_,
- 0,
- sizeof (data_image_indicator_array_));
-
- for (std::size_t i (0); i < traits::data_column_count; ++i)
- data_image_bind_array_[i].indicator = data_image_indicator_array_ + i;
this->insert_one_text_ = traits::insert_one_statement;
this->select_all_text_ = traits::select_all_statement;
diff --git a/odb/oracle/object-statements.hxx b/odb/oracle/object-statements.hxx
index 095787f..4b35892 100644
--- a/odb/oracle/object-statements.hxx
+++ b/odb/oracle/object-statements.hxx
@@ -20,7 +20,6 @@
#include <odb/oracle/version.hxx>
#include <odb/oracle/oracle-types.hxx>
-#include <odb/oracle/oracle-fwd.hxx> // sb2
#include <odb/oracle/statement.hxx>
#include <odb/oracle/statements-base.hxx>
diff --git a/odb/oracle/view-statements.hxx b/odb/oracle/view-statements.hxx
index e620856..231ca0a 100644
--- a/odb/oracle/view-statements.hxx
+++ b/odb/oracle/view-statements.hxx
@@ -63,12 +63,6 @@ namespace odb
return image_binding_;
}
- sb2*
- image_indicator ()
- {
- return image_indicator_;
- }
-
private:
view_statements (const view_statements&);
view_statements& operator= (const view_statements&);
@@ -78,7 +72,6 @@ namespace odb
std::size_t image_version_;
binding image_binding_;
bind image_bind_[view_traits::column_count];
- sb2 image_indicator_[view_traits::column_count];
};
}
}
diff --git a/odb/oracle/view-statements.txx b/odb/oracle/view-statements.txx
index 9bb601b..3b292e5 100644
--- a/odb/oracle/view-statements.txx
+++ b/odb/oracle/view-statements.txx
@@ -3,7 +3,6 @@
// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
// license : ODB NCUEL; see accompanying LICENSE file
-#include <cstddef> // std::size_t
#include <cstring> // std::memset
namespace odb
@@ -28,10 +27,6 @@ namespace odb
image_binding_.change_callback = image_.change_callback ();
std::memset (image_bind_, 0, sizeof (image_bind_));
- std::memset (image_indicator_, 0, sizeof (image_indicator_));
-
- for (std::size_t i (0); i < view_traits::column_count; ++i)
- image_bind_[i].indicator = image_indicator_ + i;
}
}
}