From a9a31b5ca7deb54388f805c94e585e359162e2e4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 17 Sep 2012 08:32:59 +0200
Subject: Remove unused local typedefs (GCC 4.8 warning)

---
 common/inheritance/driver.cxx  | 7 +------
 common/polymorphism/driver.cxx | 6 ------
 common/schema/driver.cxx       | 1 -
 common/view/driver.cxx         | 8 --------
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/common/inheritance/driver.cxx b/common/inheritance/driver.cxx
index 466ed33..ba907ce 100644
--- a/common/inheritance/driver.cxx
+++ b/common/inheritance/driver.cxx
@@ -129,15 +129,10 @@ main (int argc, char* argv[])
     //
     {
       typedef odb::query<base> b_query;
-      typedef odb::result<base> b_result;
-
       typedef odb::query<object1> o1_query;
-      typedef odb::result<object1> o1_result;
-
       typedef odb::query<object2> o2_query;
-      typedef odb::result<object2> o2_result;
-
       typedef odb::query<reference> r_query;
+
       typedef odb::result<reference> r_result;
 
       transaction t (db->begin ());
diff --git a/common/polymorphism/driver.cxx b/common/polymorphism/driver.cxx
index 6093178..1bd8a2f 100644
--- a/common/polymorphism/driver.cxx
+++ b/common/polymorphism/driver.cxx
@@ -333,7 +333,6 @@ main (int argc, char* argv[])
         typedef odb::query<base> base_query;
         typedef odb::result<base> base_result;
 
-        typedef odb::query<derived> derived_query;
         typedef odb::result<derived> derived_result;
 
         transaction t (db->begin ());
@@ -477,7 +476,6 @@ main (int argc, char* argv[])
         typedef odb::query<base_view> base_query;
         typedef odb::result<base_view> base_result;
 
-        typedef odb::query<derived_view> derived_query;
         typedef odb::result<derived_view> derived_result;
 
         transaction t (db->begin ());
@@ -706,10 +704,7 @@ main (int argc, char* argv[])
       // Views.
       //
       {
-        typedef odb::query<root_view> root_query;
         typedef odb::result<root_view> root_result;
-
-        typedef odb::query<base_view> base_query;
         typedef odb::result<base_view> base_result;
 
         transaction t (db->begin ());
@@ -953,7 +948,6 @@ main (int argc, char* argv[])
       }
 
       {
-        typedef odb::query<view2> query;
         typedef odb::result<view2> result;
 
         transaction t (db->begin ());
diff --git a/common/schema/driver.cxx b/common/schema/driver.cxx
index ddbeb26..a47d1f6 100644
--- a/common/schema/driver.cxx
+++ b/common/schema/driver.cxx
@@ -90,7 +90,6 @@ main (int argc, char* argv[])
     }
 
     {
-      typedef odb::query<table_view> query;
       typedef odb::result<table_view> result;
 
       transaction t (db->begin ());
diff --git a/common/view/driver.cxx b/common/view/driver.cxx
index 76ffa1c..e000e06 100644
--- a/common/view/driver.cxx
+++ b/common/view/driver.cxx
@@ -146,7 +146,6 @@ template <typename V>
 void
 view6_test (const auto_ptr<database>& db, const odb::query<V>& q)
 {
-  typedef odb::query<V> query;
   typedef odb::result<V> result;
   typedef typename result::iterator iterator;
 
@@ -227,7 +226,6 @@ main (int argc, char* argv[])
     // view1
     //
     {
-      typedef odb::query<view1> query;
       typedef odb::result<view1> result;
 
       {
@@ -263,7 +261,6 @@ main (int argc, char* argv[])
     // view1a
     //
     {
-      typedef odb::query<view1a> query;
       typedef odb::result<view1a> result;
 
       {
@@ -315,7 +312,6 @@ main (int argc, char* argv[])
     // view1c
     //
     {
-      typedef odb::query<view1c> query;
       typedef odb::result<view1c> result;
 
       {
@@ -344,7 +340,6 @@ main (int argc, char* argv[])
     // view1d
     //
     {
-      typedef odb::query<view1d> query;
       typedef odb::result<view1d> result;
 
       {
@@ -373,7 +368,6 @@ main (int argc, char* argv[])
     // view3
     //
     {
-      typedef odb::query<view3> query;
       typedef odb::result<const view3> result; // Test const result.
 
       {
@@ -511,7 +505,6 @@ main (int argc, char* argv[])
     // view8
     //
     {
-      typedef odb::query<view8> query;
       typedef odb::result<view8> result;
 
       {
@@ -591,7 +584,6 @@ main (int argc, char* argv[])
     // view11
     //
     {
-      typedef odb::query<view11> query;
       typedef odb::result<view11> result;
 
       {
-- 
cgit v1.1