From f167e58e1bc3959f32da890022cccfa51f2c73ec Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 23 Aug 2011 16:06:53 +0200
Subject: Don't use override as name

It is a keyword in C++-0x.
---
 libxsd/xsd/cxx/tree/comparison-map.hxx        | 2 +-
 libxsd/xsd/cxx/tree/comparison-map.txx        | 4 ++--
 libxsd/xsd/cxx/tree/std-ostream-map.hxx       | 2 +-
 libxsd/xsd/cxx/tree/std-ostream-map.txx       | 4 ++--
 libxsd/xsd/cxx/tree/stream-extraction-map.hxx | 2 +-
 libxsd/xsd/cxx/tree/stream-extraction-map.txx | 4 ++--
 libxsd/xsd/cxx/tree/stream-insertion-map.hxx  | 2 +-
 libxsd/xsd/cxx/tree/stream-insertion-map.txx  | 4 ++--
 libxsd/xsd/cxx/tree/type-factory-map.hxx      | 2 +-
 libxsd/xsd/cxx/tree/type-factory-map.txx      | 4 ++--
 libxsd/xsd/cxx/tree/type-serializer-map.hxx   | 2 +-
 libxsd/xsd/cxx/tree/type-serializer-map.txx   | 4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'libxsd')

diff --git a/libxsd/xsd/cxx/tree/comparison-map.hxx b/libxsd/xsd/cxx/tree/comparison-map.hxx
index 6fb6c3b..dd3e0a8 100644
--- a/libxsd/xsd/cxx/tree/comparison-map.hxx
+++ b/libxsd/xsd/cxx/tree/comparison-map.hxx
@@ -27,7 +27,7 @@ namespace xsd
         comparison_map ();
 
         void
-        register_type (const type_id&, comparator, bool override = true);
+        register_type (const type_id&, comparator, bool replace = true);
 
         void
         unregister_type (const type_id&);
diff --git a/libxsd/xsd/cxx/tree/comparison-map.txx b/libxsd/xsd/cxx/tree/comparison-map.txx
index 7da4a1e..6793ad0 100644
--- a/libxsd/xsd/cxx/tree/comparison-map.txx
+++ b/libxsd/xsd/cxx/tree/comparison-map.txx
@@ -212,9 +212,9 @@ namespace xsd
 
       template <typename C>
       void comparison_map<C>::
-      register_type (const type_id& tid, comparator c, bool override)
+      register_type (const type_id& tid, comparator c, bool replace)
       {
-        if (override || type_map_.find (&tid) == type_map_.end ())
+        if (replace || type_map_.find (&tid) == type_map_.end ())
           type_map_[&tid] = c;
       }
 
diff --git a/libxsd/xsd/cxx/tree/std-ostream-map.hxx b/libxsd/xsd/cxx/tree/std-ostream-map.hxx
index 4a0a155..cc987f3 100644
--- a/libxsd/xsd/cxx/tree/std-ostream-map.hxx
+++ b/libxsd/xsd/cxx/tree/std-ostream-map.hxx
@@ -28,7 +28,7 @@ namespace xsd
         std_ostream_map ();
 
         void
-        register_type (const type_id&, inserter, bool override = true);
+        register_type (const type_id&, inserter, bool replace = true);
 
         void
         unregister_type (const type_id&);
diff --git a/libxsd/xsd/cxx/tree/std-ostream-map.txx b/libxsd/xsd/cxx/tree/std-ostream-map.txx
index f113b96..874f8d2 100644
--- a/libxsd/xsd/cxx/tree/std-ostream-map.txx
+++ b/libxsd/xsd/cxx/tree/std-ostream-map.txx
@@ -211,9 +211,9 @@ namespace xsd
 
       template <typename C>
       void std_ostream_map<C>::
-      register_type (const type_id& tid, inserter i, bool override)
+      register_type (const type_id& tid, inserter i, bool replace)
       {
-        if (override || type_map_.find (&tid) == type_map_.end ())
+        if (replace || type_map_.find (&tid) == type_map_.end ())
           type_map_[&tid] = i;
       }
 
diff --git a/libxsd/xsd/cxx/tree/stream-extraction-map.hxx b/libxsd/xsd/cxx/tree/stream-extraction-map.hxx
index 4d505cf..1c18d51 100644
--- a/libxsd/xsd/cxx/tree/stream-extraction-map.hxx
+++ b/libxsd/xsd/cxx/tree/stream-extraction-map.hxx
@@ -33,7 +33,7 @@ namespace xsd
         void
         register_type (const qualified_name& name,
                        extractor,
-                       bool override = true);
+                       bool replace = true);
 
         void
         unregister_type (const qualified_name& name);
diff --git a/libxsd/xsd/cxx/tree/stream-extraction-map.txx b/libxsd/xsd/cxx/tree/stream-extraction-map.txx
index 1d72d74..17b3fc5 100644
--- a/libxsd/xsd/cxx/tree/stream-extraction-map.txx
+++ b/libxsd/xsd/cxx/tree/stream-extraction-map.txx
@@ -219,9 +219,9 @@ namespace xsd
       void stream_extraction_map<S, C>::
       register_type (const qualified_name& name,
                      extractor e,
-                     bool override)
+                     bool replace)
       {
-        if (override || type_map_.find (name) == type_map_.end ())
+        if (replace || type_map_.find (name) == type_map_.end ())
           type_map_[name] = e;
       }
 
diff --git a/libxsd/xsd/cxx/tree/stream-insertion-map.hxx b/libxsd/xsd/cxx/tree/stream-insertion-map.hxx
index 66e9ea3..d393aec 100644
--- a/libxsd/xsd/cxx/tree/stream-insertion-map.hxx
+++ b/libxsd/xsd/cxx/tree/stream-insertion-map.hxx
@@ -34,7 +34,7 @@ namespace xsd
         register_type (const type_id&,
                        const qualified_name& name,
                        inserter,
-                       bool override = true);
+                       bool replace = true);
 
         void
         unregister_type (const type_id&);
diff --git a/libxsd/xsd/cxx/tree/stream-insertion-map.txx b/libxsd/xsd/cxx/tree/stream-insertion-map.txx
index 5150dbd..64f36ea 100644
--- a/libxsd/xsd/cxx/tree/stream-insertion-map.txx
+++ b/libxsd/xsd/cxx/tree/stream-insertion-map.txx
@@ -248,9 +248,9 @@ namespace xsd
       register_type (const type_id& tid,
                      const qualified_name& name,
                      inserter i,
-                     bool override)
+                     bool replace)
       {
-        if (override || type_map_.find (&tid) == type_map_.end ())
+        if (replace || type_map_.find (&tid) == type_map_.end ())
           type_map_[&tid] = type_info (name, i);
       }
 
diff --git a/libxsd/xsd/cxx/tree/type-factory-map.hxx b/libxsd/xsd/cxx/tree/type-factory-map.hxx
index a6a0568..a42ef96 100644
--- a/libxsd/xsd/cxx/tree/type-factory-map.hxx
+++ b/libxsd/xsd/cxx/tree/type-factory-map.hxx
@@ -35,7 +35,7 @@ namespace xsd
         void
         register_type (const qualified_name& name,
                        factory,
-                       bool override = true);
+                       bool replace = true);
 
         void
         unregister_type (const qualified_name& name);
diff --git a/libxsd/xsd/cxx/tree/type-factory-map.txx b/libxsd/xsd/cxx/tree/type-factory-map.txx
index a1fca4e..998fb7b 100644
--- a/libxsd/xsd/cxx/tree/type-factory-map.txx
+++ b/libxsd/xsd/cxx/tree/type-factory-map.txx
@@ -226,9 +226,9 @@ namespace xsd
       void type_factory_map<C>::
       register_type (const qualified_name& name,
                      factory f,
-                     bool override)
+                     bool replace)
       {
-        if (override || type_map_.find (name) == type_map_.end ())
+        if (replace || type_map_.find (name) == type_map_.end ())
           type_map_[name] = f;
       }
 
diff --git a/libxsd/xsd/cxx/tree/type-serializer-map.hxx b/libxsd/xsd/cxx/tree/type-serializer-map.hxx
index f76f93f..0ac9299 100644
--- a/libxsd/xsd/cxx/tree/type-serializer-map.hxx
+++ b/libxsd/xsd/cxx/tree/type-serializer-map.hxx
@@ -35,7 +35,7 @@ namespace xsd
         register_type (const type_id&,
                        const qualified_name& name,
                        serializer,
-                       bool override = true);
+                       bool replace = true);
 
         void
         unregister_type (const type_id&);
diff --git a/libxsd/xsd/cxx/tree/type-serializer-map.txx b/libxsd/xsd/cxx/tree/type-serializer-map.txx
index 459dea0..1dd1e52 100644
--- a/libxsd/xsd/cxx/tree/type-serializer-map.txx
+++ b/libxsd/xsd/cxx/tree/type-serializer-map.txx
@@ -255,9 +255,9 @@ namespace xsd
       register_type (const type_id& tid,
                      const qualified_name& name,
                      serializer s,
-                     bool override)
+                     bool replace)
       {
-        if (override || type_map_.find (&tid) == type_map_.end ())
+        if (replace || type_map_.find (&tid) == type_map_.end ())
           type_map_[&tid] = type_info (name, s);
       }
 
-- 
cgit v1.1