From 8e6556357b2e4aecea2ae4153a6b855f29a4cdf8 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Fri, 16 Jan 2004 17:52:16 +0000
Subject: [PATCH] From Philippe: Update the stl code to write Long64_t instead
of long long.
git-svn-id: http://root.cern.ch/svn/root/trunk@7922 27541ba8-7e3a-0410-8455-c3a389f83636
---
utils/src/RStl.cxx | 5 +++--
utils/src/rootcint.cxx | 16 +++-------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/utils/src/RStl.cxx b/utils/src/RStl.cxx
index 9a643650e2d..b8a50431c66 100644
--- a/utils/src/RStl.cxx
+++ b/utils/src/RStl.cxx
@@ -1,4 +1,4 @@
-// @(#)root/utils:$Name: $:$Id: TStl.cxx,v 1.143 2003/08/15 18:52:50 brun Exp $
+// @(#)root/utils:$Name: $:$Id: RStl.cxx,v 1.1 2004/01/10 10:52:31 brun Exp $
// Author: Philippe Canal 27/08/2003
/*************************************************************************
@@ -25,6 +25,7 @@ void WriteClassInit(G__ClassInfo &cl);
void WriteAuxFunctions(G__ClassInfo &cl);
enum ESTLType {kNone, kVector, kList, kDeque, kMap, kMultimap, kSet, kMultiset};
int ElementStreamer(G__TypeInfo &ti,const char *R__t,int rwmode,const char *tcl=0);
+string GetLong64_Name(const string& original);
//
// ROOT::RStl is the rootcint STL handling class.
@@ -101,7 +102,7 @@ void ROOT::RStl::WriteStreamer(FILE *file, G__ClassInfo &stlcl) {
string streamerName = "stl_streamer_";
- string shortTypeName = TClassEdit::ShortType(stlcl.Name(),TClassEdit::kDropStlDefault);
+ string shortTypeName = GetLong64_Name( TClassEdit::ShortType(stlcl.Name(),TClassEdit::kDropStlDefault) );
string noConstTypeName( TClassEdit::CleanType(shortTypeName.c_str(),2) );
streamerName += G__map_cpp_name((char *)shortTypeName.c_str());
diff --git a/utils/src/rootcint.cxx b/utils/src/rootcint.cxx
index b8233c19bcb..1a4941c5f51 100644
--- a/utils/src/rootcint.cxx
+++ b/utils/src/rootcint.cxx
@@ -1,4 +1,4 @@
-// @(#)root/utils:$Name: $:$Id: rootcint.cxx,v 1.147 2004/01/03 09:42:30 brun Exp $
+// @(#)root/utils:$Name: $:$Id: rootcint.cxx,v 1.148 2004/01/10 10:52:31 brun Exp $
// Author: Fons Rademakers 13/07/96
/*************************************************************************
@@ -1243,7 +1243,7 @@ void WriteAuxFunctions(G__ClassInfo &cl)
// operator delete
// operator delete[]
- string classname( RStl::DropDefaultArg( cl.Fullname() ) );
+ string classname( GetLong64_Name(RStl::DropDefaultArg( cl.Fullname() ) ) );
string mappedname = G__map_cpp_name((char*)classname.c_str());
if ( TClassEdit::IsSTLCont( classname.c_str() ) == 0
@@ -2022,7 +2022,7 @@ void WriteClassInit(G__ClassInfo &cl)
{
// Write the code to initialize the class name and the initialization object.
- string classname = RStl::DropDefaultArg( cl.Fullname() );
+ string classname = GetLong64_Name( RStl::DropDefaultArg( cl.Fullname() ) );
// TClassEdit::ShortType( cl.Fullname(),
// TClassEdit::kRemoveDefaultAlloc );
string mappedname = G__map_cpp_name((char*)classname.c_str());
@@ -2573,18 +2573,8 @@ void WriteAutoStreamer(G__ClassInfo &cl)
fprintf(fp, " // Stream an object of class %s.\n\n", cl.Fullname());
fprintf(fp, " if (R__b.IsReading()) {\n");
fprintf(fp, " %s::Class()->ReadBuffer(R__b, this);\n", cl.Fullname());
- G__BaseClassInfo br(cl);
-//VP while (br.Next())
-//VP if (IsSTLContainer(br)) {
-//VP STLBaseStreamer(br,0); //Redundant, already done in ReadBuffer
-//VP }
fprintf(fp, " } else {\n");
fprintf(fp, " %s::Class()->WriteBuffer(R__b, this);\n", cl.Fullname());
- G__BaseClassInfo bw(cl);
-//VP while (bw.Next()) //Redundant, already done in WriteBuffer
-//VP if (IsSTLContainer(bw)) {
-//VP STLBaseStreamer(bw,1);
-//VP }
fprintf(fp, " }\n");
fprintf(fp, "}\n\n");
}
--
GitLab