Ticket #7007: bcp.patch

licence_info.cpp

@@ -702 +702 @@
          ,
          "<P>The code has no license terms, it has been explicity placed in the\n"
          "public domain by it's author(s).</P>"
        )
       ,
    };
-   return std::pair<const license_info*, int>(licenses, sizeof(licenses)/sizeof(licenses[0]));
+   return std::pair<const license_info*, int>(licenses, static_cast<int>(sizeof(licenses)/sizeof(licenses[0])));
 }
 
 std::string format_authors_name(const std::string& name)
 {
    // put name into a consistent format, so that we don't get too much
    // of a proliferation of names (lots of versions of the same basic form).

scan_cvs_path.cpp

@@ -28 +28 @@
    //
    static const char* file_list[] = { "CVS/Entries", "CVS/Entries.Log" };
    static const boost::regex file_expression("^(?:A\\s+)?/([^/\\n]+)/[^/\\n]*/[^/\\n]*/[^k/\\n]*(kb[^/\\n]*)?/[^/\\n]*");
    static const boost::regex dir_expression("^(?:A\\s+)?D/([^/\\n]+)/");
    static const int file_subs[] = {1,2,};
 
-   for(int entry = 0; entry < sizeof(file_list)/sizeof(file_list[0]); ++entry)
+   for(size_t entry = 0; entry < sizeof(file_list)/sizeof(file_list[0]); ++entry)
    {
       fs::path entries(m_boost_path / p / file_list[entry]);
       if(fs::exists(entries))
       {
          fileview view(entries);
          boost::regex_token_iterator<const char*> i(view.begin(), view.end(), dir_expression, 1);

scan_licence.cpp

@@ -24 +24 @@
 fileview::const_iterator
 context_before_license(const fileview& v, fileview::const_iterator start,
                        int context_lines = 3)
 {
   char last_char = '\0';
   while (start != v.begin() && context_lines >= 0) {
-    if (*start == '\r' || *start == '\n'
-        && (last_char == *start || (last_char != '\r' && last_char != '\n')))
+    if (((*start == '\r') || (*start == '\n'))
+        && ((last_char == *start) || ((last_char != '\r') && (last_char != '\n'))))
         --context_lines;
 
     last_char = *start;
     --start;
   }
 
@@ -45 +45 @@
 fileview::const_iterator
 context_after_license(const fileview& v, fileview::const_iterator end,
                       int context_lines = 3)
 {
   char last_char = '\0';
   while (end != v.end() && context_lines >= 0) {
-    if (*end == '\r' || *end == '\n'
-        && (last_char == *end || (last_char != '\r' && last_char != '\n')))
+    if (((*end == '\r') || (*end == '\n'))
+        && ((last_char == *end) || ((last_char != '\r') && (last_char != '\n'))))
         --context_lines;
 
     last_char = *end;
     ++end;
   }