From f63fbd15d68b2c8ff3c5c8facb92c6057e518c54 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Wed, 22 Aug 2018 08:22:17 -0700
Subject: [PATCH] [cxxmodules] Remove uses of Gtypes.h
It was deprecated (by comment) and emptied in year 2000.
This patch removes all uses of it and 'registers' it to the modulemap
to avoid our duplication algorithms do not find it as a duplicate.
---
core/base/CMakeLists.txt | 1 +
core/base/src/TROOT.cxx | 1 -
graf2d/qt/inc/TQtBrush.h | 1 -
graf3d/eve/inc/TEveStraightLineSet.h | 1 -
graf3d/gl/inc/TGLScene.h | 2 --
5 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
index 3ff590b1db4..18b277b6941 100644
--- a/core/base/CMakeLists.txt
+++ b/core/base/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/res ${CMAKE_CURRENT_SOURCE_DIR}/
ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/LinkDef?.h
${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h
${CMAKE_CURRENT_SOURCE_DIR}/inc/Rtypes.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/inc/Gtypes.h
${CMAKE_CURRENT_SOURCE_DIR}/inc/GuiTypes.h
${CMAKE_CURRENT_SOURCE_DIR}/inc/MessageTypes.h
${CMAKE_CURRENT_SOURCE_DIR}/inc/KeySymbols.h
diff --git a/core/base/src/TROOT.cxx b/core/base/src/TROOT.cxx
index c546efa803b..deb85ae7832 100644
--- a/core/base/src/TROOT.cxx
+++ b/core/base/src/TROOT.cxx
@@ -114,7 +114,6 @@ FARPROC dlsym(void *library, const char *function_name)
#endif
#include "Riostream.h"
-#include "Gtypes.h"
#include "TROOT.h"
#include "TClass.h"
#include "TClassEdit.h"
diff --git a/graf2d/qt/inc/TQtBrush.h b/graf2d/qt/inc/TQtBrush.h
index 02126a3a4a7..868347e516b 100644
--- a/graf2d/qt/inc/TQtBrush.h
+++ b/graf2d/qt/inc/TQtBrush.h
@@ -22,7 +22,6 @@
#endif
#include "Rtypes.h"
-#include "Gtypes.h"
class TAttFill;
class TPoint;
diff --git a/graf3d/eve/inc/TEveStraightLineSet.h b/graf3d/eve/inc/TEveStraightLineSet.h
index e13a93ff969..576ffb991dc 100644
--- a/graf3d/eve/inc/TEveStraightLineSet.h
+++ b/graf3d/eve/inc/TEveStraightLineSet.h
@@ -14,7 +14,6 @@
#include "TEveUtil.h"
-#include <Gtypes.h>
#include "TNamed.h"
#include "TQObject.h"
#include "TAtt3D.h"
diff --git a/graf3d/gl/inc/TGLScene.h b/graf3d/gl/inc/TGLScene.h
index cb553e90771..ce2b2946378 100644
--- a/graf3d/gl/inc/TGLScene.h
+++ b/graf3d/gl/inc/TGLScene.h
@@ -15,8 +15,6 @@
#include "TGLSceneBase.h"
#include "TGLSceneInfo.h"
-#include "Gtypes.h"
-
#include <map>
#include <vector>
--
GitLab