Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved code to new FWCore/Reflection package #27287

Merged
merged 3 commits into from Jun 24, 2019
Merged

Moved code to new FWCore/Reflection package #27287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a88734e
Moved code to new FWCore/Reflection package
Dr15Jones Jun 19, 2019
06484de
Added FWCore/Reflection
Dr15Jones Jun 20, 2019
29e5e0f
Applied code-format changes
Dr15Jones Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommonTools/Utils/interface/StringCutObjectSelector.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
#include "CommonTools/Utils/src/SelectorPtr.h"
#include "CommonTools/Utils/src/SelectorBase.h"
#include "CommonTools/Utils/interface/cutParser.h"
#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"

template <typename T, bool DefaultLazyness = false>
struct StringCutObjectSelector {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/interface/StringObjectFunction.h
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
#include "CommonTools/Utils/src/ExpressionPtr.h"
#include "CommonTools/Utils/src/ExpressionBase.h"
#include "CommonTools/Utils/interface/expressionParser.h"
#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"

template <typename T, bool DefaultLazyness = false>
struct StringObjectFunction {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/interface/cutParser.h
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
#define CommonTools_Utils_cutParset_h
#include "CommonTools/Utils/src/SelectorPtr.h"
#include "CommonTools/Utils/interface/Exception.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include <string>

namespace reco {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/interface/expressionParser.h
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
#define CommonTools_Utils_expressionParset_h
#include "CommonTools/Utils/src/ExpressionPtr.h"
#include "CommonTools/Utils/interface/Exception.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include <string>

namespace reco {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/AnyMethodArgument.h
View file
Open in desktop
@@ -1,7 +1,7 @@
#ifndef CommonTools_Utils_AnyMethodArgument_h
#define CommonTools_Utils_AnyMethodArgument_h

#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "CommonTools/Utils/interface/Exception.h"

Expand Down
8 changes: 4 additions & 4 deletions CommonTools/Utils/src/ExpressionVar.cc
View file
Open in desktop
@@ -1,10 +1,10 @@
#include "CommonTools/Utils/src/ExpressionVar.h"
#include "CommonTools/Utils/src/MethodInvoker.h"

#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Utilities/interface/FunctionWithDict.h"
#include "FWCore/Utilities/interface/MemberWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/MemberWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"

#include <cassert>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/Grammar.h
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@
#include "CommonTools/Utils/src/MethodSetter.h"
#include "CommonTools/Utils/src/MethodArgumentSetter.h"
#include "CommonTools/Utils/interface/Exception.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
// #include "CommonTools/Utils/src/Abort.h"

namespace reco {
Expand Down
6 changes: 3 additions & 3 deletions CommonTools/Utils/src/MethodInvoker.h
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@

#include "CommonTools/Utils/src/AnyMethodArgument.h"
#include "CommonTools/Utils/src/TypeCode.h"
#include "FWCore/Utilities/interface/FunctionWithDict.h"
#include "FWCore/Utilities/interface/MemberWithDict.h"
#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/MemberWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
#include "FWCore/Utilities/interface/TypeID.h"

#include <boost/shared_ptr.hpp>
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/TypeStack.h
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
* \version $Revision: 1.2 $
*
*/
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include <vector>

namespace reco {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/findDataMember.cc
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
#include "TInterpreter.h"
#include "TVirtualMutex.h"

#include "FWCore/Utilities/interface/BaseWithDict.h"
#include "FWCore/Reflection/interface/BaseWithDict.h"

// user include files
#include "CommonTools/Utils/src/findDataMember.h"
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/findDataMember.h
View file
Open in desktop
Expand Up @@ -21,8 +21,8 @@

// system include files
#include <string>
#include "FWCore/Utilities/interface/MemberWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/MemberWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
// user include files

// forward declarations
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/findMethod.cc
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@

#include "CommonTools/Utils/src/ErrorCodes.h"
#include "CommonTools/Utils/interface/Exception.h"
#include "FWCore/Utilities/interface/BaseWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/BaseWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/TypeID.h"

#include <cassert>
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/findMethod.h
View file
Open in desktop
@@ -1,7 +1,7 @@
#ifndef CommonTools_Utils_findMethod_h
#define CommonTools_Utils_findMethod_h
#include "FWCore/Utilities/interface/FunctionWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include <string>
#include "CommonTools/Utils/src/AnyMethodArgument.h"

Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/returnType.cc
View file
Open in desktop
@@ -1,7 +1,7 @@
#include "CommonTools/Utils/src/returnType.h"

#include "FWCore/Utilities/interface/FunctionWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"

#include <algorithm>
#include <cstring>
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/returnType.h
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
*/

#include "CommonTools/Utils/src/TypeCode.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"

namespace edm {
class FunctionWithDict;
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/test/testCutParser.cc
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
#include "DataFormats/MuonReco/interface/Muon.h"
#include <iostream>
#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include <typeinfo>

#include "DataFormats/GeometrySurface/interface/Surface.h"
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/test/testExpressionParser.cc
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@
#include "CommonTools/Utils/interface/StringToEnumValue.h"

#include <iostream>
#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include <typeinfo>
#include "DataFormats/Common/interface/TestHandle.h"

Expand Down
2 changes: 1 addition & 1 deletion CondCore/CondDB/test/testRootStreaming.cpp
View file
Open in desktop
@@ -1,6 +1,6 @@
#include "FWCore/PluginManager/interface/PluginManager.h"
#include "FWCore/PluginManager/interface/standard.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "MyTestData.h"
//
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Common/test/DictionaryTools_t.cpp
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include "DataFormats/Common/interface/Wrapper.h"
#include "FWCore/Utilities/interface/TypeDemangler.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"

#include "cppunit/extensions/HelperMacros.h"
Expand Down
1 change: 1 addition & 0 deletions DataFormats/FWLite/BuildFile.xml
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
<use name="FWCore/FWLite"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Reflection"/>
<use name="rootcore"/>
<export>
<lib name="1"/>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/FWLite/interface/InternalDataKey.h
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
// Created: Jan 29 09:01:20 CDT 2009
//

#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "FWCore/Utilities/interface/propagate_const.h"

Expand Down
4 changes: 2 additions & 2 deletions DataFormats/FWLite/src/DataGetterHelper.cc
View file
Open in desktop
Expand Up @@ -29,9 +29,9 @@

#include "FWCore/Utilities/interface/EDMException.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Utilities/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/WrappedClassName.h"

namespace fwlite {
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/FWLite/src/Record.cc
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
#include "DataFormats/FWLite/interface/Record.h"
#include "DataFormats/Provenance/interface/ESRecordAuxiliary.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "DataFormats/FWLite/interface/format_type_name.h"

//
Expand Down
46 changes: 23 additions & 23 deletions DataFormats/PatCandidates/src/UserData.cc
View file
Open in desktop
@@ -1,32 +1,32 @@
#include <cxxabi.h>
#include "DataFormats/PatCandidates/interface/UserData.h"
// Note: these two below are allowed in FWLite even if they come from FWCore
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/EDMException.h"

void pat::UserData::checkDictionaries(const std::type_info &type) {
if (!edm::hasDictionary(type)) {
int status = 0;
char * demangled = abi::__cxa_demangle(type.name(), nullptr, nullptr, &status);
std::string typeName(status == 0 ? demangled : type.name());
if ((demangled != nullptr) && (status == 0)) free(demangled);
throw edm::Exception(edm::errors::DictionaryNotFound)
<< " No REFLEX data dictionary found for the following class:\n\t"
<< typeName
<< "\n Most likely the dictionary was never generated,\n"
<< " but it may be that it was generated in the wrong package.\n"
<< " Please add (or move) the specification\n"
<< "\t<class name=\"" << typeName << "\" />\n"
<< " to the appropriate classes_def.xml file.\n"
<< " If the class is a template instance, you may need\n"
<< " to define a dummy variable of this type in classes.h.\n"
<< " Also, if this class has any transient members,\n"
<< " you need to specify them in classes_def.xml.\n";
} // check for dictionary
void pat::UserData::checkDictionaries(const std::type_info& type) {
if (!edm::hasDictionary(type)) {
int status = 0;
char* demangled = abi::__cxa_demangle(type.name(), nullptr, nullptr, &status);
std::string typeName(status == 0 ? demangled : type.name());
if ((demangled != nullptr) && (status == 0))
free(demangled);
throw edm::Exception(edm::errors::DictionaryNotFound)
<< " No REFLEX data dictionary found for the following class:\n\t" << typeName
<< "\n Most likely the dictionary was never generated,\n"
<< " but it may be that it was generated in the wrong package.\n"
<< " Please add (or move) the specification\n"
<< "\t<class name=\"" << typeName << "\" />\n"
<< " to the appropriate classes_def.xml file.\n"
<< " If the class is a template instance, you may need\n"
<< " to define a dummy variable of this type in classes.h.\n"
<< " Also, if this class has any transient members,\n"
<< " you need to specify them in classes_def.xml.\n";
} // check for dictionary
}

std::string pat::UserData::typeNameFor(std::type_info const& iType) {
int status = 0;
const char * demangled = abi::__cxa_demangle(iType.name(), nullptr, nullptr, &status);
return std::string(status == 0 ? demangled : "[UNKNOWN]");
int status = 0;
const char* demangled = abi::__cxa_demangle(iType.name(), nullptr, nullptr, &status);
return std::string(status == 0 ? demangled : "[UNKNOWN]");
}
1 change: 1 addition & 0 deletions DataFormats/Provenance/BuildFile.xml
View file
Open in desktop
@@ -1,4 +1,5 @@
<use name="FWCore/Utilities"/>
<use name="FWCore/Reflection"/>
<use name="boost"/>
<use name="rootcore"/>
<use name="tbb"/>
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/Provenance/interface/BranchDescription.h
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ This description also applies to every product instance on the branch.
#include "DataFormats/Provenance/interface/ProductID.h"
#include "DataFormats/Provenance/interface/ProvenanceFwd.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"

#include <iosfwd>
#include <map>
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/Provenance/src/BranchDescription.cc
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@
#include "FWCore/Utilities/interface/EDMException.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Utilities/interface/FriendlyName.h"
#include "FWCore/Utilities/interface/FunctionWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/WrappedClassName.h"

#include "TDictAttributeMap.h"
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/Provenance/src/ProductRegistry.cc
View file
Open in desktop
Expand Up @@ -13,9 +13,9 @@

#include "FWCore/Utilities/interface/Algorithms.h"
#include "FWCore/Utilities/interface/EDMException.h"
#include "FWCore/Utilities/interface/DictionaryTools.h"
#include "FWCore/Reflection/interface/DictionaryTools.h"
#include "FWCore/Utilities/interface/TypeID.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/WrappedClassName.h"

#include "TDictAttributeMap.h"
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/Provenance/src/ProductResolverIndexHelper.cc
View file
Open in desktop
@@ -1,9 +1,9 @@

#include "DataFormats/Provenance/interface/ProductResolverIndexHelper.h"
#include "DataFormats/Provenance/interface/ViewTypeChecker.h"
#include "FWCore/Utilities/interface/DictionaryTools.h"
#include "FWCore/Reflection/interface/DictionaryTools.h"
#include "FWCore/Utilities/interface/EDMException.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/WrappedClassName.h"
#include "FWCore/Utilities/interface/getAnyPtr.h"

Expand Down
1 change: 1 addition & 0 deletions DataFormats/TestObjects/test/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,7 @@
<use name="cppunit"/>
<use name="DataFormats/TestObjects"/>
<bin file="Enum_t.cpp">
<use name="FWCore/Reflection"/>
<use name="DataFormats/StdDictionaries"/>
<use name="DataFormats/WrappedStdDictionaries"/>
</bin>
2 changes: 1 addition & 1 deletion DataFormats/TestObjects/test/Enum_t.cpp
View file
Open in desktop
@@ -1,7 +1,7 @@
// Test of the DictionaryTools functions.

#include "FWCore/Utilities/interface/TypeDemangler.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "DataFormats/TestObjects/interface/ToyProducts.h"
#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"

Expand Down
2 changes: 1 addition & 1 deletion FWCore/FWLite/src/BareRootProductGetter.cc
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
#include "DataFormats/Provenance/interface/BranchType.h"
#include "DataFormats/Provenance/interface/ThinnedAssociationsHelper.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
#include "FWCore/Utilities/interface/WrappedClassName.h"

// system include files
Expand Down
1 change: 1 addition & 0 deletions FWCore/Framework/BuildFile.xml
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@
<use name="FWCore/ParameterSet"/>
<use name="FWCore/PluginManager"/>
<use name="FWCore/ServiceRegistry"/>
<use name="FWCore/Reflection"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/Version"/>
<use name="boost"/>
Expand Down
4 changes: 2 additions & 2 deletions FWCore/Framework/interface/GenericHandle.h
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@

// user include files
#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Utilities/interface/ObjectWithDict.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"

// system include files
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/src/OutputModule.cc
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Utilities/interface/DebugMacros.h"
#include "FWCore/Utilities/interface/DictionaryTools.h"
#include "FWCore/Reflection/interface/DictionaryTools.h"
#include "FWCore/Utilities/interface/EDGetToken.h"

#include "SharedResourcesRegistry.h"
Expand Down
4 changes: 2 additions & 2 deletions FWCore/Framework/src/ProductRegistryHelper.cc
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
#include "DataFormats/Provenance/interface/ProductRegistry.h"
#include "DataFormats/Provenance/interface/BranchDescription.h"
#include "DataFormats/Provenance/interface/ModuleDescription.h"
#include "FWCore/Utilities/interface/DictionaryTools.h"
#include "FWCore/Reflection/interface/DictionaryTools.h"
#include "FWCore/Utilities/interface/EDMException.h"
#include "FWCore/Utilities/interface/TypeWithDict.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"

#include <vector>
#include <typeindex>
Expand Down