svn commit: r328859 - head/devel/liblas/files

[John Marino]

Author: marino
Date: Mon Sep 30 20:08:18 2013
New Revision: 328859
URL: http://svnweb.freebsd.org/changeset/ports/328859

Log:
  devel/liblas: fix [-fpermissive] cannot call constructor errors
  
  The port doesn't build with gcc4.7+ without this patch.  Partial log:
  las_c_api.cpp: In function 'LASErrorEnum LASHeader_SetProjectId(LASHeaderH, const char*)':
  las_c_api.cpp:748:38: error: cannot call constructor 'liblas::guid::guid' directly [-fpermissive]
  las_c_api.cpp:748:38: error:   for a function-style cast, remove the redundant '::guid' [-fpermissive]
  las_c_api.cpp: In function 'LASGuidHS* LASGuid_CreateFromString(const char*)':
  las_c_api.cpp:1545:39: error: cannot call constructor 'liblas::guid::guid' directly [-fpermissive]
  las_c_api.cpp:1545:39: error:   for a function-style cast, remove the redundant '::guid' [-fpermissive]
  
  Approved by:	portmgr (bapt, implicit)

Added:
  head/devel/liblas/files/
  head/devel/liblas/files/patch-src_las__c__api.cpp   (contents, props changed)

Added: head/devel/liblas/files/patch-src_las__c__api.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/liblas/files/patch-src_las__c__api.cpp	Mon Sep 30 20:08:18 2013	(r328859)
@@ -0,0 +1,20 @@
+--- src/las_c_api.cpp.orig	2009-10-02 17:01:59.000000000 +0000
++++ src/las_c_api.cpp
+@@ -745,7 +745,7 @@ LAS_DLL LASErrorEnum LASHeader_SetProjec
+ 
+     try {
+         liblas::guid id;
+-        id = liblas::guid::guid(value);
++        id = liblas::guid(value);
+         ((LASHeader*) hHeader)->SetProjectId(id);    
+     } catch (std::exception const& e)
+     {
+@@ -1542,7 +1542,7 @@ LAS_DLL LASGuidH LASGuid_CreateFromStrin
+     VALIDATE_LAS_POINTER1(string, "LASGuid_CreateFromString", NULL);    
+     liblas::guid id;
+     try {
+-        id = liblas::guid::guid(string);
++        id = liblas::guid(string);
+         return (LASGuidH) new liblas::guid(id);
+     }
+     catch (std::exception const& e) {