Commit e05f79b6 authored by Conor Finn's avatar Conor Finn
Browse files

Fix incorrectly named variables after rebase

parent 279f25e1
......@@ -136,7 +136,7 @@ ConfigServiceImpl::ConfigServiceImpl()
#else
m_user_properties_file_name("Mantid.user.properties"),
#endif
m_dataSearchDirs(), m_InstrumentDirs(), m_proxyInfo(),
m_dataSearchDirs(), m_instrumentDirs(), m_proxyInfo(),
m_isProxySet(false) {
// getting at system details
m_pSysConfig = new Poco::Util::SystemConfiguration();
......
......@@ -61,7 +61,7 @@ GNU_DIAG_OFF("conversion")
// Overload generator for getInstrument
BOOST_PYTHON_FUNCTION_OVERLOADS(getInstrument_Overload, getInstrument, 1, 2)
// Overload generator for getString
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getStringOverload,
BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload,
ConfigServiceImpl::getString, 1, 2)
GNU_DIAG_ON("conversion")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment