Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
63245576
Commit
63245576
authored
Sep 10, 2021
by
David Fairbrother
Browse files
Fix namespace closing behind macro def
Fixes the namespace definition which had too many closing braces on APPLE devices
parent
cd7a35db
Changes
1
Hide whitespace changes
Inline
Side-by-side
Framework/Kernel/src/IPropertyManager.cpp
View file @
63245576
...
...
@@ -118,20 +118,13 @@ IPropertyManager::TypedValue::operator OptionalBool() { return pm.getValue<Optio
IPropertyManager
::
TypedValue
::
operator
Property
*
()
{
return
pm
.
getPointerToProperty
(
prop
);
}
#ifdef __APPLE__
}
// namespace Kernel
}
// namespace Mantid
// These must precede the operator() declaration
// These must precede the operator() declaration, temporarily switch batch to global namespace
}
DEFINE_IPROPERTYMANAGER_GETVALUE
(
unsigned
long
);
DEFINE_IPROPERTYMANAGER_GETVALUE
(
std
::
vector
<
unsigned
long
>
);
namespace
Mantid
{
namespace
Kernel
{
// Intel 64-bit size_t
namespace
Mantid
::
Kernel
{
IPropertyManager
::
TypedValue
::
operator
unsigned
long
()
{
return
pm
.
getValue
<
unsigned
long
>
(
prop
);
}
}
// namespace Kernel
}
// namespace Mantid
#else
}
// namespace Mantid
#endif
}
// namespace Mantid::Kernel
/// @endcond
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment