Changeset 6285

Timestamp:

30/11/09 12:15:54 (2 years ago)

Author:

baderk

Message:

Karmic Koala (gcc 4.4.1) patch.

Location:

trunk

Files:

• AWT/AWT_db_browser.cxx (modified) (1 diff)
• AWT/AWT_file_selection.cxx (modified) (1 diff)
• AWTI/AWTI_import.cxx (modified) (1 diff)
• HELP_SOURCE/arb_help2xml.cxx (modified) (1 diff)
• Makefile (modified) (1 diff)
• NTREE/NT_edconf.cxx (modified) (1 diff)
• PROBE_DESIGN/SaiProbeVisualization.cxx (modified) (1 diff)
• PROBE_DESIGN/probe_design.cxx (modified) (1 diff)
• SL/FAST_ALIGNER/ClustalV.cxx (modified) (1 diff)
• SL/FILE_BUFFER/FileBuffer.cxx (modified) (1 diff)
• TOOLS/arb_gene_probe.cxx (modified) (1 diff)

trunk/AWT/AWT_db_browser.cxx

@@ -483 +483 @@
 
 inline void insert_history_selection(AW_window *aww, AW_selection_list *sel, const char *entry, int wanted_db) {
-    char *colon = strchr(entry, ':');
+    const char *colon = strchr(entry, ':');
     if (colon && (atoi(entry) == wanted_db)) {
         aww->insert_selection(sel, colon+1, colon+1);

trunk/AWT/AWT_file_selection.cxx

@@ -143 +143 @@
 
 char *AWT_extract_directory(const char *path) {
-    char *lslash = strrchr(path, '/');
+    const char *lslash = strrchr(path, '/');
     if (!lslash) return 0;
 

trunk/AWTI/AWTI_import.cxx

@@ -20 +20 @@
 
 inline const char *name_only(const char *fullpath) {
-    char *lslash = strrchr(fullpath, '/');
+    const char *lslash = strrchr(fullpath, '/');
     return lslash ? lslash+1 : fullpath;
 }

trunk/HELP_SOURCE/arb_help2xml.cxx

@@ -312 +312 @@
     // otherwise returns position behind keyword and sets value of 'keyword'
 
-    char *space = strchr(line, ' ');
+    const char *space = strchr(line, ' ');
     if (space && space>line) {
         keyword = string(line, 0, space-line);

trunk/Makefile

@@ -59 +59 @@
         4.2.0 4.2.1 4.2.3 4.2.4 \
         4.3 4.3.1 4.3.2 4.3.3 \
+        4.4.1
 
 ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)

trunk/NTREE/NT_edconf.cxx

@@ -245 +245 @@
     struct SAI_string_builder *sai_builder = (struct SAI_string_builder*)cd_sai_builder;
 
-    char *sep = strchr(key,1);
+    const char *sep = strchr(key,1);
     if (!sep) return val;                           // what's wrong
 

trunk/PROBE_DESIGN/SaiProbeVisualization.cxx

@@ -524 +524 @@
                     if (!tok_suffix) {
                         // handle special case where no suffix exists
-                        char *end = strchr(probeRegion, 0);
+                        const char *end = strchr(probeRegion, 0);
                         if (end>probeRegion && end[-1] == '-') tok_suffix = "";
                     }

trunk/PROBE_DESIGN/probe_design.cxx

@@ -1846 +1846 @@
 
         if (!error) { // set pt-server database file to same permissions as pts directory
-            char *dir = strrchr(file,'/');
+            char *dir = const_cast<char*>(strrchr(file,'/'));
             if (dir) {
                 *dir = 0;

trunk/SL/FAST_ALIGNER/ClustalV.cxx

@@ -287 +287 @@
 //          -1 if one char is illegal
 {
-    char *p1 = strchr(nucleic_acid_order, c1);
-    char *p2 = strchr(nucleic_acid_order, c2);
+    const char *p1 = strchr(nucleic_acid_order, c1);
+    const char *p2 = strchr(nucleic_acid_order, c2);
 
     awtc_assert(c1);

trunk/SL/FILE_BUFFER/FileBuffer.cxx

@@ -13 +13 @@
 #include <cstdlib>
 #include <cstring>
+#include <cstdio>
 #include <errno.h>
 

trunk/TOOLS/arb_gene_probe.cxx

@@ -216 +216 @@
 
 #if defined(DEBUG)
-    char *firstSem = strchr(long_name, ';');
+    const char *firstSem = strchr(long_name, ';');
     gp_assert(firstSem);
     CHECK_SEMI_ESCAPED(firstSem+1);