New upstream.

1 files changed, 67 insertions, 0 deletions

diff --git a/patch_c++.patch b/patch_c++.patch
new file mode 100644
index 000000000000..ff60746976be
--- /dev/null
+++ b/patch_c++.patch
@@ -0,0 +1,67 @@
+--- src/nco++/fmc_all_cls.cc.orig	2017-05-30 15:12:10.776336877 +0200
++++ src/nco++/fmc_all_cls.cc	2017-05-30 15:15:42.744050089 +0200
+@@ -4521,7 +4521,7 @@
+     size_t slb_sz=nco_typ_lng(var_att->type);   
+       
+     strncpy(buffer,(char*)var_add->val.vp, var_add->sz);            
+-    buffer[var_add->sz]='\0';
++    buffer[var_add->sz]= '\0';
+     sz_new=var_att->sz+1;
+  
+     var_att->val.vp=nco_realloc(var_att->val.vp, sz_new*slb_sz);           
+@@ -4668,7 +4668,7 @@
+       char buffer[1200];
+  
+       strncpy(buffer, var_regexp->val.cp, var_regexp->sz);   
+-      buffer[var_regexp->sz]='\0';
++      buffer[var_regexp->sz]= '\0';
+       lcp=&buffer[0];
+       xtr_nbr=1;
+       xtr_lst=nco_var_lst_mk(fl_id, nbr_var_fl, &lcp  , False, False,&xtr_nbr);       
+@@ -4782,7 +4782,7 @@
+   if(var_in->type==NC_CHAR)
+   {
+     strncpy(buffer, var_in->val.cp, var_in->sz); 
+-    buffer[var_in->sz]='\0';
++    buffer[var_in->sz]= '\0';
+   }
+   else if(var_in->type==NC_STRING)
+     strcpy(buffer, var_in->val.sngp[0]); 
+@@ -4796,7 +4796,7 @@
+   {
+      case PATOI: 
+        {          
+-         char *pend='\0';
++         char *pend="\0";
+          nco_int iout;
+          iout=0; 
+ 
+@@ -4817,7 +4817,7 @@
+ 
+      case PATOL: 
+        {          
+-         char *pend='\0';
++         char *pend="\0";
+          nco_int64 lout;
+          lout=0; 
+ 
+@@ -5218,7 +5218,7 @@
+    else
+    {
+      strncpy(fmt_sng,var_fmt->val.cp, var_fmt->sz);  
+-     fmt_sng[var_fmt->sz]='\0';   
++     fmt_sng[var_fmt->sz]= '\0';   
+    }
+ 
+   cast_nctype_void(var_fmt->type,&var_fmt->val); 
+--- src/nco++/map_srt_tmp.hh.orig	2017-05-30 15:09:59.906194663 +0200
++++ src/nco++/map_srt_tmp.hh	2017-05-30 15:10:11.802912659 +0200
+@@ -70,7 +70,7 @@
+   if(bd)
+     std::sort(mp,mp+sz);  // increasing
+   else 
+-    std:sort(mp,mp+sz,map_srt<T>::greater);  // decreasing
++    std::sort(mp,mp+sz,map_srt<T>::greater);  // decreasing
+ 
+   //The above line may not work with some compilers if so replace with the following
+   // { std::sort(mp,mp+sz); std::reverse(mp,mp+sz);}