diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-28 11:33:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-28 11:34:10 +0100 |
| commit | 863e1f0035430316d2b52c667737905a07875438 (patch) | |
| tree | 0520f27e377c9349632e577ce252f8f57a560385 /include/canvas/base/canvasbase.hxx | |
| parent | 10303054067258016fbbae018ea848f74adc4964 (diff) | |
Revert "canvas: replace BOOST_CURRENT_FUNCTION with __func__"
This reverts commit d01f7db4b5f51d1be8ba210625f4ad1ebf5c6e8f.
Revert "tools: replace BOOST_CURRENT_FUNCTION with __func__"
This reverts commit 10303054067258016fbbae018ea848f74adc4964.
Surprisingly MSVC 2013 does not support __func__ - need 2015.
Change-Id: I7084d7b79784b34a8f40fb986d10ffefbabae7fb
Diffstat (limited to 'include/canvas/base/canvasbase.hxx')
| -rw-r--r-- | include/canvas/base/canvasbase.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 1af4d929f955..9bb513c397d1 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -139,7 +139,7 @@ namespace canvas std::exception) override { tools::verifyArgs(aPoint, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -156,7 +156,7 @@ namespace canvas std::exception) override { tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -175,7 +175,7 @@ namespace canvas std::exception) override { tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -194,7 +194,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -214,7 +214,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -233,7 +233,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -253,7 +253,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -271,7 +271,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -290,7 +290,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -310,7 +310,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -328,7 +328,7 @@ namespace canvas const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -349,7 +349,7 @@ namespace canvas // dummy, to keep argPos in sync fontRequest, fontMatrix, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -364,7 +364,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(aFilter, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -384,7 +384,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xFont, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); tools::verifyRange( textDirection, css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT, @@ -407,7 +407,7 @@ namespace canvas std::exception) override { tools::verifyArgs(laidOutText, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -424,7 +424,7 @@ namespace canvas const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -440,7 +440,7 @@ namespace canvas const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); |