From 83b367aaceaa196de2bd191719c06a520f21ac62 Mon Sep 17 00:00:00 2001 From: Andreas Salzburger <Andreas.Salzburger@cern.ch> Date: Thu, 4 May 2017 14:30:49 +0200 Subject: [PATCH] Remove ROOT:: namespace from ROOT::Geom (although needed on my system :-( ) --- Core/include/ACTS/Surfaces/BoundaryCheck.hpp | 2 +- Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp | 2 +- Core/include/ACTS/Surfaces/EllipseBounds.hpp | 2 +- Core/include/ACTS/Surfaces/InfiniteBounds.hpp | 2 +- Core/include/ACTS/Surfaces/LineBounds.hpp | 2 +- Core/include/ACTS/Surfaces/PlanarBounds.hpp | 2 +- Core/include/ACTS/Surfaces/RadialBounds.hpp | 2 +- Core/include/ACTS/Surfaces/RectangleBounds.hpp | 2 +- Core/include/ACTS/Surfaces/SurfaceBounds.hpp | 2 +- Core/include/ACTS/Surfaces/TrapezoidBounds.hpp | 2 +- Core/include/ACTS/Surfaces/TriangleBounds.hpp | 2 +- Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp | 2 +- Core/src/Surfaces/LineBounds.cpp | 2 +- Core/src/Surfaces/RadialBounds.cpp | 2 +- Core/src/Surfaces/RectangleBounds.cpp | 2 +- Core/src/Surfaces/TrapezoidBounds.cpp | 2 +- Core/src/Surfaces/TriangleBounds.cpp | 2 +- Plugins/TGeoPlugins/CMakeLists.txt | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp b/Core/include/ACTS/Surfaces/BoundaryCheck.hpp index e61a137d1..a9d45436d 100644 --- a/Core/include/ACTS/Surfaces/BoundaryCheck.hpp +++ b/Core/include/ACTS/Surfaces/BoundaryCheck.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp b/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp index ab6434aac..cd51a3bb3 100644 --- a/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp +++ b/Core/include/ACTS/Surfaces/DiscTrapezoidalBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/EllipseBounds.hpp b/Core/include/ACTS/Surfaces/EllipseBounds.hpp index 33c985b6b..66c430dee 100644 --- a/Core/include/ACTS/Surfaces/EllipseBounds.hpp +++ b/Core/include/ACTS/Surfaces/EllipseBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp b/Core/include/ACTS/Surfaces/InfiniteBounds.hpp index e4013a6e2..2d6b0ca6f 100644 --- a/Core/include/ACTS/Surfaces/InfiniteBounds.hpp +++ b/Core/include/ACTS/Surfaces/InfiniteBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/LineBounds.hpp b/Core/include/ACTS/Surfaces/LineBounds.hpp index b6fbe6b50..3a8f0ea78 100644 --- a/Core/include/ACTS/Surfaces/LineBounds.hpp +++ b/Core/include/ACTS/Surfaces/LineBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/PlanarBounds.hpp b/Core/include/ACTS/Surfaces/PlanarBounds.hpp index 3db6616d4..e33c75842 100644 --- a/Core/include/ACTS/Surfaces/PlanarBounds.hpp +++ b/Core/include/ACTS/Surfaces/PlanarBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/RadialBounds.hpp b/Core/include/ACTS/Surfaces/RadialBounds.hpp index 6f68436e3..55eb7bd27 100644 --- a/Core/include/ACTS/Surfaces/RadialBounds.hpp +++ b/Core/include/ACTS/Surfaces/RadialBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/RectangleBounds.hpp b/Core/include/ACTS/Surfaces/RectangleBounds.hpp index c595532f1..66009031b 100644 --- a/Core/include/ACTS/Surfaces/RectangleBounds.hpp +++ b/Core/include/ACTS/Surfaces/RectangleBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp index fbd1d63bf..5d4c70c72 100644 --- a/Core/include/ACTS/Surfaces/SurfaceBounds.hpp +++ b/Core/include/ACTS/Surfaces/SurfaceBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp index 386d69736..70b7da1dd 100644 --- a/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp +++ b/Core/include/ACTS/Surfaces/TrapezoidBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Surfaces/TriangleBounds.hpp b/Core/include/ACTS/Surfaces/TriangleBounds.hpp index 7f56eefd7..b6c8e63e1 100644 --- a/Core/include/ACTS/Surfaces/TriangleBounds.hpp +++ b/Core/include/ACTS/Surfaces/TriangleBounds.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp index de29debff..96e367c9d 100644 --- a/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp +++ b/Core/include/ACTS/Utilities/detail/RealQuadraticEquation.hpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp index d34fca1bd..9a68bf8c6 100644 --- a/Core/src/Surfaces/LineBounds.cpp +++ b/Core/src/Surfaces/LineBounds.cpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp index 9387c412d..72a572cb0 100644 --- a/Core/src/Surfaces/RadialBounds.cpp +++ b/Core/src/Surfaces/RadialBounds.cpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp index 3536e1100..f1d486a2f 100644 --- a/Core/src/Surfaces/RectangleBounds.cpp +++ b/Core/src/Surfaces/RectangleBounds.cpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp index df37e3a26..421e9ebcd 100644 --- a/Core/src/Surfaces/TrapezoidBounds.cpp +++ b/Core/src/Surfaces/TrapezoidBounds.cpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Core/src/Surfaces/TriangleBounds.cpp b/Core/src/Surfaces/TriangleBounds.cpp index 1ca061c38..cb9745b17 100644 --- a/Core/src/Surfaces/TriangleBounds.cpp +++ b/Core/src/Surfaces/TriangleBounds.cpp @@ -1,6 +1,6 @@ // This file is part of the ACTS project. // -// Copyright (C) 2016-2017 ACTS project team +// Copyright (C) 2016 ACTS project team // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/Plugins/TGeoPlugins/CMakeLists.txt b/Plugins/TGeoPlugins/CMakeLists.txt index baf0b3dba..e844eeb4a 100644 --- a/Plugins/TGeoPlugins/CMakeLists.txt +++ b/Plugins/TGeoPlugins/CMakeLists.txt @@ -18,7 +18,7 @@ if (BUILD_TGEO_PLUGIN) # setup linker dependencies target_link_libraries (ACTSTGeoPlugin PUBLIC ACTSCore) - target_link_libraries (ACTSTGeoPlugin PUBLIC ROOT::Geom) + target_link_libraries (ACTSTGeoPlugin PUBLIC Geom) # set installation directories install (TARGETS ACTSTGeoPlugin EXPORT ACTSTGeoPluginTargets -- GitLab