From b561674433825361de5bdeb9c779587ab42d9feb Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Thu, 24 Apr 2008 19:39:05 +0000
Subject: [PATCH] revert the std::string forward declaration, not allowed by
the standard.
git-svn-id: http://root.cern.ch/svn/root/trunk@23536 27541ba8-7e3a-0410-8455-c3a389f83636
---
core/base/inc/TString.h | 17 -----------------
core/base/src/TString.cxx | 2 --
core/cont/inc/TCollection.h | 6 ------
3 files changed, 25 deletions(-)
diff --git a/core/base/inc/TString.h b/core/base/inc/TString.h
index d238274a5e4..be1b311d8e5 100644
--- a/core/base/inc/TString.h
+++ b/core/base/inc/TString.h
@@ -41,24 +41,7 @@
#endif
#include <stdarg.h>
-
-#ifndef __CINT__
-namespace std
-{
- template<typename _Alloc>
- class allocator;
-
- template<typename _CharT>
- struct char_traits;
-
- template<typename _CharT, typename _Traits, typename _Alloc>
- class basic_string;
-
- typedef basic_string<char, char_traits<char>, allocator<char> > string;
-}
-#else
#include <string>
-#endif
#ifdef R__GLOBALSTL
namespace std { using ::string; }
diff --git a/core/base/src/TString.cxx b/core/base/src/TString.cxx
index 4f05a188130..3beb0f49521 100644
--- a/core/base/src/TString.cxx
+++ b/core/base/src/TString.cxx
@@ -40,8 +40,6 @@
#include "TObjString.h"
#include "TVirtualMutex.h"
-#include <string>
-
#ifdef R__GLOBALSTL
namespace std { using ::list; }
#endif
diff --git a/core/cont/inc/TCollection.h b/core/cont/inc/TCollection.h
index f1a5e1f5179..9a4e5d30f56 100644
--- a/core/cont/inc/TCollection.h
+++ b/core/cont/inc/TCollection.h
@@ -34,12 +34,6 @@
#include "TString.h"
#endif
-#ifndef __CINT__
-namespace std
-{
- template<typename _Tp> struct iterator_traits;
-}
-#endif
class TClass;
class TObjectTable;
--
GitLab