svn commit: r478248 - head/devel/omniORB-4.1/files

[Tobias Kortkamp]

Author: tobik
Date: Mon Aug 27 19:59:10 2018
New Revision: 478248
URL: https://svnweb.freebsd.org/changeset/ports/478248

Log:
  devel/omniORB-4.1: Fix build with Clang 6
  
  corbaOrb.cc:1374:13: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
                          "-ORBid "ORB_ID_STRING" (standard option)") {}
                                   ^
  
  http://beefy11.nyi.freebsd.org/data/head-i386-default/p477696_s338122/logs/errors/omniORB41-4.1.7_2.log

Added:
  head/devel/omniORB-4.1/files/patch-src_lib_omniORB_orbcore_corbaOrb.cc   (contents, props changed)

Added: head/devel/omniORB-4.1/files/patch-src_lib_omniORB_orbcore_corbaOrb.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/omniORB-4.1/files/patch-src_lib_omniORB_orbcore_corbaOrb.cc	Mon Aug 27 19:59:10 2018	(r478248)
@@ -0,0 +1,40 @@
+corbaOrb.cc:1374:13: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
+                        "-ORBid "ORB_ID_STRING" (standard option)") {}
+                                 ^
+
+--- src/lib/omniORB/orbcore/corbaOrb.cc.orig	2018-08-27 19:52:14 UTC
++++ src/lib/omniORB/orbcore/corbaOrb.cc
+@@ -1371,13 +1371,13 @@ class idHandler : public orbOptions::Handler { (public
+     orbOptions::Handler("id",
+ 			"id = " ORB_ID_STRING,
+ 			1,
+-			"-ORBid "ORB_ID_STRING" (standard option)") {}
++			"-ORBid " ORB_ID_STRING " (standard option)") {}
+ 
+ 
+   void visit(const char* value,orbOptions::Source) throw (orbOptions::BadParam) {
+ 
+     if (!isValidId(value)) {
+-      throw orbOptions::BadParam(key(),value,"id is not "ORB_ID_STRING);
++      throw orbOptions::BadParam(key(),value,"id is not " ORB_ID_STRING);
+     }
+     if( strcmp(value, myOrbId()) ) {
+       if( omniORB::trace(1) ) {
+@@ -1501,7 +1501,7 @@ class poa_iiop_portHandler : public orbOptions::Handle
+   void visit(const char* value,orbOptions::Source) throw (orbOptions::BadParam) {
+ 
+     throw orbOptions::BadParam(key(),value,
+-			       "poa_iiop_port"POA_IIOP_IS_OBSOLETE);
++			       "poa_iiop_port" POA_IIOP_IS_OBSOLETE);
+   }
+ 
+   void dump(orbOptions::sequenceString& result) {
+@@ -1520,7 +1520,7 @@ class poa_iiop_name_portHandler : public orbOptions::H
+ 
+   void visit(const char* value,orbOptions::Source) throw (orbOptions::BadParam) {
+     throw orbOptions::BadParam(key(),value,
+-			       "poa_iiop_name_port"POA_IIOP_IS_OBSOLETE);
++			       "poa_iiop_name_port" POA_IIOP_IS_OBSOLETE);
+   }
+ 
+   void dump(orbOptions::sequenceString& result) {