Merge pull request #76 from jwillemsen/jwi-whitespace

jwillemsen · web-flow · commit 4e81d93cfbcb · 2024-08-30T12:47:15.000+02:00
Removed redundant whitespaces
diff --git a/XSC/be/CXX/Elements.cpp b/XSC/be/CXX/Elements.cpp
@@ -342,14 +342,6 @@ type_name (SemanticGraph::Instance& i, string const& nss)
     }
     else
     {
-      //@@ I wonder if this is at all necessary now?
-      //
-
-      //if (!scope.empty ()) r += scope + L"::";
-
-      //r += fq_name (i.scope ());
-      //r += L"::";
-
       r += id (i.name ());
     }
 
diff --git a/XSC/be/CXX/Header.cpp b/XSC/be/CXX/Header.cpp
@@ -186,7 +186,7 @@ namespace
             break;
           case CPPMODE::CPP11:
           case CPPMODE::CPP17:
-            os << "using " << name << "_container_type = " << container  << "< " << type << ">;";
+            os << "using " << name << "_container_type = " << container  << "<" << type << ">;";
             break;
         }
         switch(this->cppmode_)
@@ -237,7 +237,7 @@ namespace
         os << "bool " << name << "_p () const;";
         os << type << " const& " << id (name) << " () const;";
         // os << type << "& " << id (name) << " ();";  // Lets just have one mutator
-        os << "void " << id (name) << " (" << type << " const& );";
+        os << "void " << id (name) << " (" << type << " const&);";
 
         //Added for IDREF case
         if ((idref_ptr != std::string::npos) && (this->cppmode_ == CPPMODE::CPP03))
@@ -251,13 +251,13 @@ namespace
         switch(this->cppmode_)
         {
           case CPPMODE::CPP03:
-            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_auto_ptr_type;";
-            os << id (name) << "_auto_ptr_type " << id (name) << "_;";
+            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_type;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
           case CPPMODE::CPP11:
           case CPPMODE::CPP17:
-            os << "using " << id (name) << "_unique_ptr_type = std::unique_ptr< " << type << ">;";
-            os << id (name) << "_unique_ptr_type " << id (name) << "_;";
+            os << "using " << id (name) << "_type = std::unique_ptr<" << type << ">;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
         }
       }
@@ -267,7 +267,7 @@ namespace
         //
         os << type << " const& " << id (name) << " () const;";
         // os << type << "& " << id (name) << " ();"; // Lets just have one mutator.
-        os << "void " << id (name) << " (" << type << " const& );";
+        os << "void " << id (name) << " (" << type << " const&);";
 
         //Added for IDREF case
         if ((idref_ptr != std::string::npos) && (this->cppmode_ == CPPMODE::CPP03))
@@ -282,13 +282,13 @@ namespace
         switch(this->cppmode_)
         {
           case CPPMODE::CPP03:
-            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_auto_ptr_type;";
-            os << id (name) << "_auto_ptr_type " << id (name) << "_;";
+            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_type;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
           case CPPMODE::CPP11:
           case CPPMODE::CPP17:
-            os << "using " << id (name) << "_unique_ptr_type = std::unique_ptr< " << type << ">;";
-            os << id (name) << "_unique_ptr_type " << id (name) << "_;";
+            os << "using " << id (name) << "_type = std::unique_ptr<" << type << ">;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
         }
       }
@@ -339,7 +339,7 @@ namespace
         os << "bool " << name << "_p () const;";
         os << type << " const& " << id (name) << " () const;";
         os << type << "& " << id (name) << " ();";
-        os << "void " << id (name) << " (" << type << " const& );";
+        os << "void " << id (name) << " (" << type << " const&);";
 
         //Added for IDREF case
         if ((idref_ptr != std::string::npos) && (this->cppmode_ == CPPMODE::CPP03))
@@ -354,21 +354,21 @@ namespace
         switch(this->cppmode_)
         {
           case CPPMODE::CPP03:
-            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_auto_ptr_type;";
-            os << id (name) << "_auto_ptr_type " << id (name) << "_;";
+            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_type;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
           case CPPMODE::CPP11:
           case CPPMODE::CPP17:
-            os << "using " << id (name) << "_unique_ptr_type = std::unique_ptr< " << type << ">;";
-            os << id (name) << "_unique_ptr_type " << id (name) << "_;";
+            os << "using " << id (name) << "_type = std::unique_ptr<" << type << ">;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
         }
       }
       else
       {
         os << type << " const& " << id (name) << " () const;";
         os << type << "& " << id (name) << " ();";
-        os << "void " << id (name) << " (" << type << " const& );";
+        os << "void " << id (name) << " (" << type << " const&);";
 
         //Added for IDREF case
         if ((idref_ptr != std::string::npos) && (this->cppmode_ == CPPMODE::CPP03))
@@ -383,13 +383,13 @@ namespace
         switch(this->cppmode_)
         {
           case CPPMODE::CPP03:
-            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_auto_ptr_type;";
-            os << id (name) << "_auto_ptr_type " << id (name) << "_;";
+            os << "typedef XML_XSC_SMART_PTR( " << type << ") " << id (name) << "_type;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
           case CPPMODE::CPP11:
           case CPPMODE::CPP17:
-            os << "using " << id (name) << "_unique_ptr_type = std::unique_ptr< " << type << ">;";
-            os << id (name) << "_unique_ptr_type " << id (name) << "_;";
+            os << "using " << id (name) << "_type = std::unique_ptr<" << type << ">;";
+            os << id (name) << "_type " << id (name) << "_;";
             break;
         }
       }
diff --git a/XSC/be/CXX/Inline.cpp b/XSC/be/CXX/Inline.cpp
@@ -124,12 +124,12 @@ namespace
           switch(this->cppmode_)
           {
             case CPPMODE::CPP03:
-              os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (e));"
+              os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (e));"
                 << id (name) << "_->container (this);";
               break;
             case CPPMODE::CPP11:
             case CPPMODE::CPP17:
-              os << id (name) << "_ = std::make_unique< " << type << "> (e);";
+              os << id (name) << "_ = std::make_unique<" << type << "> (e);";
               break;
         }
         os << "}"
@@ -145,14 +145,6 @@ namespace
            << "{"
            << "return *" << id (name) << "_;"
            << "}";
-        /* Lets just have one mutator
-        os << i
-           << type << "& " << scope << "::" << endl
-           << id (name) << " ()"
-           << "{"
-           << "return *" << id (name) << "_;"
-           << "}";
-        */
         if ((idref_ptr != std::string::npos) && (this->cppmode_ == CPPMODE::CPP03))
         {
            os << i
@@ -275,7 +267,6 @@ namespace
           os << "}";
         }
 
-//        if (!this->cpp11_)
         {
           // count_typename
           //
@@ -380,11 +371,11 @@ namespace
 
         if (this->cppmode_ != CPPMODE::CPP03)
         {
-          os << id (name) << "_ = std::make_unique< " << type << "> (e);";
+          os << id (name) << "_ = std::make_unique<" << type << "> (e);";
         }
         else
         {
-          os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (e));"
+          os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (e));"
              << id (name) << "_->container (this);";
         }
         os << "}"
@@ -460,12 +451,6 @@ namespace
       names_.node_traverser (*this);
     }
 
-    //virtual void
-    //traverse (SemanticGraph::Type& t)
-    //{
-    //  os << comma () << type_name (t) << " const& b__";
-    //}
-
     virtual void
     traverse (SemanticGraph::Enumeration& e)
     {
@@ -730,12 +715,6 @@ namespace
       {
       }
 
-      //virtual void
-      //traverse (SemanticGraph::Type&)
-      //{
-      //  os << "Base (b__)," << endl;
-      //}
-
       virtual void
       traverse (SemanticGraph::Enumeration&)
       {
@@ -859,7 +838,7 @@ namespace
 
           if (this->cppmode_ != CPPMODE::CPP03)
           {
-            os << ", " << name << "_ (std::make_unique< " << type << "> (" << name << "__))" << endl;
+            os << ", " << name << "_ (std::make_unique<" << type << "> (" << name << "__))" << endl;
           }
           else
           {
@@ -891,7 +870,7 @@ namespace
 
           if (this->cppmode_ != CPPMODE::CPP03)
           {
-            os << ", " << name << "_ (std::make_unique< " << type << "> (" << name << "__))" << endl;
+            os << ", " << name << "_ (std::make_unique<" << type << "> (" << name << "__))" << endl;
           }
           else
           {
@@ -988,7 +967,7 @@ namespace
             {
               os << ", " << name << "_ ("
                 << "s." << name << "_ ? "
-                << "std::make_unique< " << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;
+                << "std::make_unique<" << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;
             }
             else
             {
@@ -1003,7 +982,7 @@ namespace
             //
             if (this->cppmode_ != CPPMODE::CPP03)
             {
-              os << ", " << name << "_ (std::make_unique< " << type << "> (*s." << name << "_))" << endl;
+              os << ", " << name << "_ (std::make_unique<" << type << "> (*s." << name << "_))" << endl;
             }
             else
             {
@@ -1040,7 +1019,7 @@ namespace
           {
             os << ", " << name << "_ ("
               << "s." << name << "_ ? "
-              << "std::make_unique< " << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;
+              << "std::make_unique<" << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;
           }
           else
           {
@@ -1053,7 +1032,7 @@ namespace
         {
           if (this->cppmode_ != CPPMODE::CPP03)
           {
-            os << ", " << name << "_ (std::make_unique< " << type << "> (*s." << name << "_))" << endl;
+            os << ", " << name << "_ (std::make_unique<" << type << "> (*s." << name << "_))" << endl;
           }
           else
           {
@@ -1101,22 +1080,6 @@ namespace
         {
           os << id (name) << "_->container (this);";
         }
-        else
-        {
-          //string type (type_name (e));
-
-          //// sequence
-          ////
-          //if (this->generate_ra_sequences_)
-          //  os << name << "_.reserve (s." << name << "_.size ());";
-
-          //os << "{"
-          //   << "for (" << name << "_const_iterator i (s."
-          //   << name << "_.begin ());"
-          //   << "i != s." << name << "_.end ();"
-          //   << "++i) " << "add_" << name << " (*i);"
-          //   << "}";
-        }
       }
 
       virtual void
@@ -1154,14 +1117,6 @@ namespace
       {
       }
 
-      //virtual void
-      //traverse (SemanticGraph::Type&)
-      //{
-      //  os << "static_cast< Base& > (*this) = "
-      //     << "static_cast< Base const& > (s);"
-      //     << endl;
-      //}
-
       virtual void
       traverse (SemanticGraph::Element& e)
       {
@@ -1179,7 +1134,7 @@ namespace
             os << "if (s." << name << "_)" << std::endl
                << "  " << name << " (*(s." << name << "_));"
                << "else" << std::endl
-               << "  " << name << "_.reset (nullptr);"
+               << "  " << name << "_.release ();"
                << endl;
           }
           else
@@ -1207,19 +1162,6 @@ namespace
           //
           os << id(name) << "_ = s." << id(name) << "_;"
              << std::endl;
-
-          //os << name << "_.clear ();";
-
-          //if (this->generate_ra_sequences_)
-          //  os   << name << "_.reserve (s." << name << "_.size ());";
-
-          //os << "{"
-          //   << "for (" << name << "_const_iterator i (s."
-          //   << name << "_.begin ());"
-          //   << "i != s." << name << "_.end ();"
-          //   << "++i) " << std::endl
-          //   << "add_" << name << " (*i);"
-          //   << "}";
         }
       }
 
@@ -1235,7 +1177,7 @@ namespace
           {
             os << "if (s." << name << "_) "
               << name << " (*(s." << name << "_));"
-              << "else " << name << "_.reset (nullptr);"
+              << "else " << name << "_.release ();"
               << endl;
           }
           else
diff --git a/XSC/be/CXX/Source.cpp b/XSC/be/CXX/Source.cpp
@@ -87,11 +87,11 @@ namespace
         //
         if (this->cppmode_ != CPPMODE::CPP03)
         {
-          os << id (name) << "_ = std::make_unique< " << type << "> (e);";
+          os << id (name) << "_ = std::make_unique<" << type << "> (e);";
         }
         else
         {
-          os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (e));"
+          os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (e));"
              << id (name) << "_->container (this);";
         }
       }
@@ -231,7 +231,7 @@ namespace
         }
         else
         {
-          os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (a));"
+          os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (a));"
              << id (name) << "_->container (this);";
         }
       }
diff --git a/XSCRT/XSCRT/Elements.hpp b/XSCRT/XSCRT/Elements.hpp
@@ -60,8 +60,6 @@ namespace XSCRT
     Type&
     operator= (Type const&)
     {
-      //@@ I don't need this.
-      //if (map_.get ()) map_->clear (); // Flush the map.
       return *this;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -342,14 +342,6 @@ type_name (SemanticGraph::Instance& i, string const& nss)`
`342`	`342`	`}`
`343`	`343`	`else`
`344`	`344`	`{`
`345`		`- //@@ I wonder if this is at all necessary now?`
`346`		`- //`
`347`		`-`
`348`		`- //if (!scope.empty ()) r += scope + L"::";`
`349`		`-`
`350`		`- //r += fq_name (i.scope ());`
`351`		`- //r += L"::";`
`352`		`-`
`353`	`345`	`r += id (i.name ());`
`354`	`346`	`}`
`355`	`347`
Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,12 @@ namespace`
`124`	`124`	`switch(this->cppmode_)`
`125`	`125`	`{`
`126`	`126`	`case CPPMODE::CPP03:`
`127`		`- os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (e));"`
	`127`	`+ os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (e));"`
`128`	`128`	`<< id (name) << "_->container (this);";`
`129`	`129`	`break;`
`130`	`130`	`case CPPMODE::CPP11:`
`131`	`131`	`case CPPMODE::CPP17:`
`132`		`- os << id (name) << "_ = std::make_unique< " << type << "> (e);";`
	`132`	`+ os << id (name) << "_ = std::make_unique<" << type << "> (e);";`
`133`	`133`	`break;`
`134`	`134`	`}`
`135`	`135`	`os << "}"`
`@@ -145,14 +145,6 @@ namespace`
`145`	`145`	`<< "{"`
`146`	`146`	`<< "return *" << id (name) << "_;"`
`147`	`147`	`<< "}";`
`148`		`- /* Lets just have one mutator`
`149`		`- os << i`
`150`		`- << type << "& " << scope << "::" << endl`
`151`		`- << id (name) << " ()"`
`152`		`- << "{"`
`153`		`- << "return *" << id (name) << "_;"`
`154`		`- << "}";`
`155`		`- */`
`156`	`148`	`if ((idref_ptr != std::string::npos) && (this->cppmode_ == CPPMODE::CPP03))`
`157`	`149`	`{`
`158`	`150`	`os << i`
`@@ -275,7 +267,6 @@ namespace`
`275`	`267`	`os << "}";`
`276`	`268`	`}`
`277`	`269`
`278`		`-// if (!this->cpp11_)`
`279`	`270`	`{`
`280`	`271`	`// count_typename`
`281`	`272`	`//`
`@@ -380,11 +371,11 @@ namespace`
`380`	`371`
`381`	`372`	`if (this->cppmode_ != CPPMODE::CPP03)`
`382`	`373`	`{`
`383`		`- os << id (name) << "_ = std::make_unique< " << type << "> (e);";`
	`374`	`+ os << id (name) << "_ = std::make_unique<" << type << "> (e);";`
`384`	`375`	`}`
`385`	`376`	`else`
`386`	`377`	`{`
`387`		`- os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (e));"`
	`378`	`+ os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (e));"`
`388`	`379`	`<< id (name) << "_->container (this);";`
`389`	`380`	`}`
`390`	`381`	`os << "}"`
`@@ -460,12 +451,6 @@ namespace`
`460`	`451`	`names_.node_traverser (*this);`
`461`	`452`	`}`
`462`	`453`
`463`		`- //virtual void`
`464`		`- //traverse (SemanticGraph::Type& t)`
`465`		`- //{`
`466`		`- // os << comma () << type_name (t) << " const& b__";`
`467`		`- //}`
`468`		`-`
`469`	`454`	`virtual void`
`470`	`455`	`traverse (SemanticGraph::Enumeration& e)`
`471`	`456`	`{`
`@@ -730,12 +715,6 @@ namespace`
`730`	`715`	`{`
`731`	`716`	`}`
`732`	`717`
`733`		`- //virtual void`
`734`		`- //traverse (SemanticGraph::Type&)`
`735`		`- //{`
`736`		`- // os << "Base (b__)," << endl;`
`737`		`- //}`
`738`		`-`
`739`	`718`	`virtual void`
`740`	`719`	`traverse (SemanticGraph::Enumeration&)`
`741`	`720`	`{`
`@@ -859,7 +838,7 @@ namespace`
`859`	`838`
`860`	`839`	`if (this->cppmode_ != CPPMODE::CPP03)`
`861`	`840`	`{`
`862`		`- os << ", " << name << "_ (std::make_unique< " << type << "> (" << name << "__))" << endl;`
	`841`	`+ os << ", " << name << "_ (std::make_unique<" << type << "> (" << name << "__))" << endl;`
`863`	`842`	`}`
`864`	`843`	`else`
`865`	`844`	`{`
`@@ -891,7 +870,7 @@ namespace`
`891`	`870`
`892`	`871`	`if (this->cppmode_ != CPPMODE::CPP03)`
`893`	`872`	`{`
`894`		`- os << ", " << name << "_ (std::make_unique< " << type << "> (" << name << "__))" << endl;`
	`873`	`+ os << ", " << name << "_ (std::make_unique<" << type << "> (" << name << "__))" << endl;`
`895`	`874`	`}`
`896`	`875`	`else`
`897`	`876`	`{`
`@@ -988,7 +967,7 @@ namespace`
`988`	`967`	`{`
`989`	`968`	`os << ", " << name << "_ ("`
`990`	`969`	`<< "s." << name << "_ ? "`
`991`		`- << "std::make_unique< " << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;`
	`970`	`+ << "std::make_unique<" << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;`
`992`	`971`	`}`
`993`	`972`	`else`
`994`	`973`	`{`
`@@ -1003,7 +982,7 @@ namespace`
`1003`	`982`	`//`
`1004`	`983`	`if (this->cppmode_ != CPPMODE::CPP03)`
`1005`	`984`	`{`
`1006`		`- os << ", " << name << "_ (std::make_unique< " << type << "> (*s." << name << "_))" << endl;`
	`985`	`+ os << ", " << name << "_ (std::make_unique<" << type << "> (*s." << name << "_))" << endl;`
`1007`	`986`	`}`
`1008`	`987`	`else`
`1009`	`988`	`{`
`@@ -1040,7 +1019,7 @@ namespace`
`1040`	`1019`	`{`
`1041`	`1020`	`os << ", " << name << "_ ("`
`1042`	`1021`	`<< "s." << name << "_ ? "`
`1043`		`- << "std::make_unique< " << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;`
	`1022`	`+ << "std::make_unique<" << type << "> (*s." << name << "_) : " << nullptr_string << ")" << endl;`
`1044`	`1023`	`}`
`1045`	`1024`	`else`
`1046`	`1025`	`{`
`@@ -1053,7 +1032,7 @@ namespace`
`1053`	`1032`	`{`
`1054`	`1033`	`if (this->cppmode_ != CPPMODE::CPP03)`
`1055`	`1034`	`{`
`1056`		`- os << ", " << name << "_ (std::make_unique< " << type << "> (*s." << name << "_))" << endl;`
	`1035`	`+ os << ", " << name << "_ (std::make_unique<" << type << "> (*s." << name << "_))" << endl;`
`1057`	`1036`	`}`
`1058`	`1037`	`else`
`1059`	`1038`	`{`
`@@ -1101,22 +1080,6 @@ namespace`
`1101`	`1080`	`{`
`1102`	`1081`	`os << id (name) << "_->container (this);";`
`1103`	`1082`	`}`
`1104`		`- else`
`1105`		`- {`
`1106`		`- //string type (type_name (e));`
`1107`		`-`
`1108`		`- //// sequence`
`1109`		`- ////`
`1110`		`- //if (this->generate_ra_sequences_)`
`1111`		`- // os << name << "_.reserve (s." << name << "_.size ());";`
`1112`		`-`
`1113`		`- //os << "{"`
`1114`		`- // << "for (" << name << "_const_iterator i (s."`
`1115`		`- // << name << "_.begin ());"`
`1116`		`- // << "i != s." << name << "_.end ();"`
`1117`		`- // << "++i) " << "add_" << name << " (*i);"`
`1118`		`- // << "}";`
`1119`		`- }`
`1120`	`1083`	`}`
`1121`	`1084`
`1122`	`1085`	`virtual void`
`@@ -1154,14 +1117,6 @@ namespace`
`1154`	`1117`	`{`
`1155`	`1118`	`}`
`1156`	`1119`
`1157`		`- //virtual void`
`1158`		`- //traverse (SemanticGraph::Type&)`
`1159`		`- //{`
`1160`		`- // os << "static_cast< Base& > (*this) = "`
`1161`		`- // << "static_cast< Base const& > (s);"`
`1162`		`- // << endl;`
`1163`		`- //}`
`1164`		`-`
`1165`	`1120`	`virtual void`
`1166`	`1121`	`traverse (SemanticGraph::Element& e)`
`1167`	`1122`	`{`
`@@ -1179,7 +1134,7 @@ namespace`
`1179`	`1134`	`os << "if (s." << name << "_)" << std::endl`
`1180`	`1135`	`<< " " << name << " (*(s." << name << "_));"`
`1181`	`1136`	`<< "else" << std::endl`
`1182`		`- << " " << name << "_.reset (nullptr);"`
	`1137`	`+ << " " << name << "_.release ();"`
`1183`	`1138`	`<< endl;`
`1184`	`1139`	`}`
`1185`	`1140`	`else`
`@@ -1207,19 +1162,6 @@ namespace`
`1207`	`1162`	`//`
`1208`	`1163`	`os << id(name) << "_ = s." << id(name) << "_;"`
`1209`	`1164`	`<< std::endl;`
`1210`		`-`
`1211`		`- //os << name << "_.clear ();";`
`1212`		`-`
`1213`		`- //if (this->generate_ra_sequences_)`
`1214`		`- // os << name << "_.reserve (s." << name << "_.size ());";`
`1215`		`-`
`1216`		`- //os << "{"`
`1217`		`- // << "for (" << name << "_const_iterator i (s."`
`1218`		`- // << name << "_.begin ());"`
`1219`		`- // << "i != s." << name << "_.end ();"`
`1220`		`- // << "++i) " << std::endl`
`1221`		`- // << "add_" << name << " (*i);"`
`1222`		`- // << "}";`
`1223`	`1165`	`}`
`1224`	`1166`	`}`
`1225`	`1167`
`@@ -1235,7 +1177,7 @@ namespace`
`1235`	`1177`	`{`
`1236`	`1178`	`os << "if (s." << name << "_) "`
`1237`	`1179`	`<< name << " (*(s." << name << "_));"`
`1238`		`- << "else " << name << "_.reset (nullptr);"`
	`1180`	`+ << "else " << name << "_.release ();"`
`1239`	`1181`	`<< endl;`
`1240`	`1182`	`}`
`1241`	`1183`	`else`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,11 @@ namespace`
`87`	`87`	`//`
`88`	`88`	`if (this->cppmode_ != CPPMODE::CPP03)`
`89`	`89`	`{`
`90`		`- os << id (name) << "_ = std::make_unique< " << type << "> (e);";`
	`90`	`+ os << id (name) << "_ = std::make_unique<" << type << "> (e);";`
`91`	`91`	`}`
`92`	`92`	`else`
`93`	`93`	`{`
`94`		`- os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (e));"`
	`94`	`+ os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (e));"`
`95`	`95`	`<< id (name) << "_->container (this);";`
`96`	`96`	`}`
`97`	`97`	`}`
`@@ -231,7 +231,7 @@ namespace`
`231`	`231`	`}`
`232`	`232`	`else`
`233`	`233`	`{`
`234`		`- os << id (name) << "_ = " << scope << "::" << id(name) << "_auto_ptr_type (new " << type << " (a));"`
	`234`	`+ os << id (name) << "_ = " << scope << "::" << id(name) << "_type (new " << type << " (a));"`
`235`	`235`	`<< id (name) << "_->container (this);";`
`236`	`236`	`}`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ namespace XSCRT`
`60`	`60`	`Type&`
`61`	`61`	`operator= (Type const&)`
`62`	`62`	`{`
`63`		`- //@@ I don't need this.`
`64`		`- //if (map_.get ()) map_->clear (); // Flush the map.`
`65`	`63`	`return *this;`
`66`	`64`	`}`
`67`	`65`