Преглед изворни кода

Fix some C++ portability warnings

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54330 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements пре 12 година
родитељ
комит
bb7745c8f1

+ 1 - 1
include/iostream/ami_stream.h

@@ -94,7 +94,7 @@ enum AMI_err {
   AMI_ERROR_NO_MAIN_MEMORY_OPERATION,
 };
 
-extern char *ami_str_error[];
+extern const char *ami_str_error[];
 
 //
 // AMI stream types passed to constructors

+ 1 - 1
include/iostream/embuffer.h

@@ -988,7 +988,7 @@ AMI_err em_buffer<T,Key>::substream_merge(AMI_STREAM<T>** instreams,
 #endif
   }
 
-  T* in_objects[arity]; //pointers to current leading elements of streams
+  std::vector<T*> in_objects(arity); //pointers to current leading elements of streams
   AMI_err ami_err;
   
  

+ 1 - 1
include/iostream/empq_impl.h

@@ -1250,7 +1250,7 @@ em_pqueue<T,Key>::merge_buffer(em_buffer<T,Key> *buf,
   /* Pointers to current leading elements of streams */
   unsigned int arity = buf->get_nbstreams();
   AMI_STREAM<T>** instreams = buf->get_streams();
-  T* in_objects[arity];
+  std::vector<T*> in_objects(arity);
   AMI_err ami_err;
   unsigned int i, j;
 

+ 1 - 1
lib/iostream/ami_stream.cpp

@@ -47,7 +47,7 @@
 #include <grass/iostream/ami_stream.h>
 
 
-char *ami_str_error[] = {
+const char *ami_str_error[] = {
   "AMI_ERROR_NO_ERROR",
   "AMI_ERROR_IO_ERROR",
   "AMI_ERROR_END_OF_STREAM",

+ 1 - 1
raster/r.viewshed/distribute.cpp

@@ -189,7 +189,7 @@ unsigned long distribute_sector(AMI_STREAM < AEvent > *eventList,
 
     G_debug(2, "***  DISTRIBUTE sector [%.4f, %.4f]  ***",
 			    start_angle, end_angle);
-    G_debug(2, "initial_gradient: %lf", SMALLEST_GRADIENT);
+    G_debug(2, "initial_gradient: %f", SMALLEST_GRADIENT);
     G_debug(2, "eventlist: %s", eventList->sprint());
     if (enterBndEvents)
 	G_debug(2, "BndEvents: %s", enterBndEvents->sprint());