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

8 files changed, 36 insertions, 35 deletions

diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index b4b493682c9c..bd144f5c1418 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -112,7 +112,7 @@ namespace canvas
         {
             tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
                               destRect, destViewState, destRenderState,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex );
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 );
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 830bf9bebdbd..9813f5b5d747 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -119,7 +119,7 @@ namespace canvas
                                                                                                                              css::uno::RuntimeException) override
         {
             tools::verifyArgs(xBitmap, viewState, renderState,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -156,7 +156,7 @@ namespace canvas
                                                                                                          css::uno::RuntimeException) override
         {
             tools::verifyArgs(aNewPos, viewState, renderState,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -168,7 +168,7 @@ namespace canvas
                                                                                                                     css::uno::RuntimeException) override
         {
             tools::verifyArgs(aTransformation,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index b679cf477752..a6db3160ea66 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -187,7 +187,7 @@ namespace canvas
                    std::exception) override
         {
             tools::verifyBitmapSize(size,
-                                    __func__,
+                                    BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
@@ -199,7 +199,7 @@ namespace canvas
                                                                                                                                                                                                css::uno::RuntimeException) override
         {
             tools::verifyBitmapSize(size,
-                                    __func__,
+                                    BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
@@ -213,7 +213,7 @@ namespace canvas
                    std::exception) override
         {
             tools::verifyBitmapSize(size,
-                                    __func__,
+                                    BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
@@ -225,7 +225,7 @@ namespace canvas
                                                                                                                                                                                                     css::uno::RuntimeException) override
         {
             tools::verifyBitmapSize(size,
-                                    __func__,
+                                    BOOST_CURRENT_FUNCTION,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 0d6440a979b6..4995578fa949 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -45,7 +45,7 @@ namespace canvas
                                                                               const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
         {
             tools::verifyArgs(rect,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(rect, Base::getSize() );
 
@@ -60,7 +60,7 @@ namespace canvas
                                        const css::geometry::IntegerRectangle2D&   rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
         {
             tools::verifyArgs(bitmapLayout, rect,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(rect, Base::getSize() );
 
@@ -74,7 +74,7 @@ namespace canvas
                                         const css::geometry::IntegerPoint2D&       pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
         {
             tools::verifyArgs(bitmapLayout, pos,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(pos, Base::getSize() );
 
@@ -87,7 +87,7 @@ namespace canvas
                                                                   const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
         {
             tools::verifyArgs(pos,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(pos, Base::getSize() );
 
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index 9656be3fe07d..ba3ae036c545 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -92,7 +92,7 @@ namespace canvas
                                                                                                                                                                                                                                            css::uno::RuntimeException) override
         {
             tools::verifyArgs(animation,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -106,7 +106,7 @@ namespace canvas
                                                                                                                                                                                                                                                                                  css::uno::RuntimeException) override
         {
             tools::verifyArgs(animationBitmaps,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
             tools::verifyRange( interpolationMode,
                                 css::rendering::InterpolationMode::NEAREST_NEIGHBOR,
@@ -121,7 +121,7 @@ namespace canvas
                                                                                                                                                                                               css::uno::RuntimeException) override
         {
             tools::verifySpriteSize(spriteSize,
-                                    __func__,
+                                    BOOST_CURRENT_FUNCTION,
                                     static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -133,7 +133,7 @@ namespace canvas
                                                                                                                                                                                                                         css::uno::RuntimeException) override
         {
             tools::verifyArgs(original,
-                              __func__,
+                              BOOST_CURRENT_FUNCTION,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx
index f8b8d29c9270..308026a0e188 100644
--- a/include/canvas/debug.hxx
+++ b/include/canvas/debug.hxx
@@ -33,7 +33,7 @@
 # if OSL_DEBUG_LEVEL > 2
 #  include <osl/diagnose.h>
 #  define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \
-                                            __func__, a, \
+                                            BOOST_CURRENT_FUNCTION, a, \
                                             find_unreachable_objects(true) )
 # else
 /** This macro shows how much memory is still used by shared_ptrs
@@ -44,7 +44,7 @@
     from deletion by circular references.
  */
 #  define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \
-                                            __func__, a, \
+                                            BOOST_CURRENT_FUNCTION, a, \
                                             find_unreachable_objects(false) )
 # endif
 
diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx
index d8e95ac5f9a1..615f5295cf25 100644
--- a/include/canvas/verifyinput.hxx
+++ b/include/canvas/verifyinput.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <algorithm>
+#include <boost/current_function.hpp>
 
 #include <canvas/canvastoolsdllapi.h>