Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Apr 5, 2019 · 30ae44e · 30ae44e
2 parents 9d262d6 + ad48eeb
commit 30ae44e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...e/PyDevParameterSet/src/PyBind11Wrapper.h → ...vParameterSet/interface/PyBind11Wrapper.h b/...e/PyDevParameterSet/src/PyBind11Wrapper.h → ...vParameterSet/interface/PyBind11Wrapper.h
diff --git a/FWCore/PyDevParameterSet/interface/Python11ParameterSet.h b/FWCore/PyDevParameterSet/interface/Python11ParameterSet.h
@@ -3,7 +3,7 @@
 #include <pybind11/pybind11.h>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/PyDevParameterSet/src/PyBind11Wrapper.h"
+#include "FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h"
 
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/ESInputTag.h"

diff --git a/FWCore/PyDevParameterSet/src/PyBind11ProcessDesc.cc b/FWCore/PyDevParameterSet/src/PyBind11ProcessDesc.cc
@@ -2,7 +2,7 @@
 #include "FWCore/ParameterSet/interface/ProcessDesc.h"
 #include "FWCore/PyDevParameterSet/interface/PyBind11ProcessDesc.h"
 #include "FWCore/PyDevParameterSet/src/initializePyBind11Module.h"
-#include "FWCore/PyDevParameterSet/src/PyBind11Wrapper.h"
+#include "FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h"
 #include <pybind11/embed.h>
 #include <pybind11/pybind11.h>
 

diff --git a/FWCore/PyDevParameterSet/src/PyBind11Wrapper.cc b/FWCore/PyDevParameterSet/src/PyBind11Wrapper.cc
@@ -1,4 +1,4 @@
-#include "PyBind11Wrapper.h"
+#include "FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h"
 #include "FWCore/Utilities/interface/Exception.h"
 //#include <iostream>
 namespace edm {

diff --git a/Fireworks/FWInterface/BuildFile.xml b/Fireworks/FWInterface/BuildFile.xml
@@ -16,7 +16,7 @@
 <lib name="GuiHtml"/>
 <lib name="GX11"/>
 <use name="boost_python"/>
-<use name="FWCore/PythonParameterSet"/>
+<use name="FWCore/PyDevParameterSet"/>
 <export>
 <lib name="1"/>
 </export>
diff --git a/Fireworks/FWInterface/src/FWPathsPopup.cc b/Fireworks/FWInterface/src/FWPathsPopup.cc
@@ -24,7 +24,7 @@
 #include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
 
-#include "FWCore/PythonParameterSet/src/PythonWrapper.h"
+#include "FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h"
 #include <boost/python/errors.hpp>
 #include "TGLabel.h"
 #include "KeySymbols.h"
@@ -253,7 +253,7 @@ FWPathsPopup::scheduleReloadEvent()
    }
    catch (boost::python::error_already_set const&)
    {
-      edm::pythonToCppException("Configuration");
+     edm::pythonToCppException("Configuration","");
       Py_Finalize();
    }
    catch (cms::Exception &exception)