[Plplot-cvs] SF.net SVN: plplot:[12111] trunk/include/plplot.h

[<and...@us...>]

Revision: 12111
          http://plplot.svn.sourceforge.net/plplot/?rev=12111&view=rev
Author:   andrewross
Date:     2012-01-03 10:20:31 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Comment out the macros for Alloc2dGrid, Free2dGrid and MinMax2dGrid since these are only for backward compatibility and haven't been actively used for a long time. They interfere with the C++ bindings since the C++ plstream class uses the function names without the pl prefix and these names get mangled by the macros.

Modified Paths:
--------------
    trunk/include/plplot.h

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2011-12-15 00:42:41 UTC (rev 12110)
+++ trunk/include/plplot.h	2012-01-03 10:20:31 UTC (rev 12111)
@@ -770,9 +770,11 @@
 #define    plpage          plbop
 #define    plcol           plcol0
 #define    plcontf         plfcont
-#define    Alloc2dGrid     plAlloc2dGrid
-#define    Free2dGrid      plFree2dGrid
-#define    MinMax2dGrid    plMinMax2dGrid
+// Comment out these as they can upset the C++ bindings since the C++
+// bindings use the function names without the pl prefix. 
+//#define    Alloc2dGrid     plAlloc2dGrid
+//#define    Free2dGrid      plFree2dGrid
+//#define    MinMax2dGrid    plMinMax2dGrid
 #define    plP_gvpd        plgvpd
 #define    plP_gvpw        plgvpw
 #define    plotsh3d( x, y, z, nx, ny, opt )    plsurf3d( x, y, z, nx, ny, opt, NULL, 0 )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.