cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphics/inventor: unbreak with libc++ 3.9

Browse Source 
./SoInput.c++:2813:8: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
        char *firstPlus = strchr(n, '+');
              ^           ~~~~~~~~~~~~~~
SoInteractionKit.c++:857:12: error: cannot initialize a variable of type 'char *' with an rvalue of
      type 'const char *'
            char *dotPtr   = strchr( partName.getString(), '.' );
                  ^          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
SoInteractionKit.c++:858:12: error: cannot initialize a variable of type 'char *' with an rvalue of
      type 'const char *'
            char *brackPtr = strchr( partName.getString(), '[' );
                  ^          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Reported by:	pkg-fallout
This commit is contained in:
Jan Beich 2017-02-01 20:21:10 +00:00
parent efec6e852f
commit 7e0ecaf6d2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=433091
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/inventor/files/patch-lib_database_src_so_SoInput.c++ Normal file
View File

@ -0,0 +1,11 @@
--- lib/database/src/so/SoInput.c++.orig 2000-10-25 23:47:47 UTC
+++ lib/database/src/so/SoInput.c++
@@ -2810,7 +2810,7 @@ SoInput::addReference(const SbName &name
if (addToGlobalDict) {
// Look for the first '+':
- char *firstPlus = strchr(n, '+');
+ const char *firstPlus = strchr(n, '+');
if (firstPlus == NULL) {
base->setName(name);

13
graphics/inventor/files/patch-lib_interaction_src_nodekits_SoInteractionKit.c++ Normal file
View File

@ -0,0 +1,13 @@
--- lib/interaction/src/nodekits/SoInteractionKit.c++.orig 2000-08-15 12:56:25 UTC
+++ lib/interaction/src/nodekits/SoInteractionKit.c++
@@ -854,8 +854,8 @@ SoInteractionKit::setAnySurrogatePath( c
// (as in "childList[0].appearance")
// If so, get the string up to whichever came first.
// This will be the 'intermediary' we look for.
- char *dotPtr = strchr( partName.getString(), '.' );
- char *brackPtr = strchr( partName.getString(), '[' );
+ const char *dotPtr = strchr( partName.getString(), '.' );
+ const char *brackPtr = strchr( partName.getString(), '[' );
if ( dotPtr != NULL || brackPtr != NULL ) {
char *nameCopy = strdup( partName.getString() );