From 2a14d71462060b63918f0e6ee83ec2934aba97a6 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Mon, 8 Jun 2009 21:03:22 +0300
Subject: [PATCH] names are already unique by scope

---
 demo/demo_cxx.cpp | 4 ++--
 gen_cxx.ml        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/demo/demo_cxx.cpp b/demo/demo_cxx.cpp
index ed0b0b5..bbfa278 100644
--- a/demo/demo_cxx.cpp
+++ b/demo/demo_cxx.cpp
@@ -34,7 +34,7 @@ int main()
   gen.add_money(sancho,ivan,300);
 
   // summarize by person
-  typedef vector<gen_t::calc_total::data_4> collection;
+  typedef vector<gen_t::calc_total::data> collection;
   collection all;
   gen.calc_total(all);
 
@@ -46,7 +46,7 @@ int main()
   }
 
   // list donors
-  typedef vector<gen_t::list_donors::data_5> people;
+  typedef vector<gen_t::list_donors::data> people;
   people p;
   gen.list_donors(p,"petrov",100);
 
diff --git a/gen_cxx.ml b/gen_cxx.ml
index 6b0ac83..d785fb4 100644
--- a/gen_cxx.ml
+++ b/gen_cxx.ml
@@ -84,7 +84,7 @@ let set_param arg index param =
 
 let output_schema_binder index schema =
   out_private ();
-  let name = default_name "output" index in
+  let name = "output" in
   output "template <class T>";
   start_struct name;
 
@@ -118,7 +118,7 @@ let schema_to_values = List.mapi (fun i attr -> name_of attr i, attr.RA.domain >
 
 let output_schema_data index schema =
   out_public ();
-  let name = default_name "data" index in
+  let name = "data" in
   start_struct name;
   schema >> schema_to_values >> output_value_defs;
   end_struct name
@@ -143,7 +143,7 @@ let struct_ctor name values k =
 
 let output_params_binder index params =
   out_private ();
-  let name = default_name "params" index in
+  let name = "params" in
   let values = params_to_values params in
   struct_ctor name (make_const_values values) (fun () ->
     comment () "binding slots in a query (one param may be bound several times)";
-- 
2.11.4.GIT