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 /canvas | |
| 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 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvascustomsprite.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 3d975cba0e56..6f37f7f310b2 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -118,7 +118,7 @@ namespace cairocanvas ColorType eColorType ) { ::canvas::tools::verifyInput( renderState, - __func__, + BOOST_CURRENT_FUNCTION, const_cast<rendering::XCanvas*>(pOwner), // only for refcount 2, eColorType == IGNORE_COLOR ? 0 : 3 ); diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 71705347ad5b..b410c561ba8d 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -73,7 +73,7 @@ namespace oglcanvas uno::RuntimeException, std::exception) { canvas::tools::verifyArgs(aNewPos, viewState, renderState, - __func__, + BOOST_CURRENT_FUNCTION, static_cast< ::cppu::OWeakObject* >(this)); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index e1ebe431bc86..0932e0cfc8f9 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -380,7 +380,7 @@ namespace oglcanvas void SpriteDeviceHelper::dumpScreenContent() const { - SAL_INFO("canvas.ogl", __func__); + SAL_INFO("canvas.ogl", BOOST_CURRENT_FUNCTION ); } void SpriteDeviceHelper::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite ) diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 441590bcb51e..bee83b1af78f 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -677,7 +677,7 @@ namespace vclcanvas "bitmap is NULL"); ::canvas::tools::verifyInput( renderState, - __func__, + BOOST_CURRENT_FUNCTION, mpDevice, 4, bModulateColors ? 3 : 0 ); @@ -1195,7 +1195,7 @@ namespace vclcanvas "outdev null. Are we disposed?" ); ::canvas::tools::verifyInput( renderState, - __func__, + BOOST_CURRENT_FUNCTION, mpDevice, 2, eColorType == IGNORE_COLOR ? 0 : 3 ); |