Namespace "std"

aclocal.m4

@@ -14,8 +14,8 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
-[m4_warning([this file was generated for autoconf 2.71.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
+[m4_warning([this file was generated for autoconf 2.72.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])

collaboration/settings.cpp

@@ -34,10 +34,9 @@
 #include <collaboration/link.h>
 #include <tasks/logic.h>
 #include <jobs/index.h>
-using namespace std;
 
 
-string collaboration_settings_url ()
+std::string collaboration_settings_url ()
 {
   return "collaboration/settings";
 }
@@ -49,7 +48,7 @@ bool collaboration_settings_acl (Webserver_Request& webserver_request)
 }
 
 
-string collaboration_settings (Webserver_Request& webserver_request)
+std::string collaboration_settings (Webserver_Request& webserver_request)
 {
   std::string page;
   Assets_Header header = Assets_Header (translate("Collaboration"), webserver_request);

compare/compare.cpp

@@ -36,7 +36,6 @@
 #include <database/books.h>
 #include <database/config/bible.h>
 #include <jobs/index.h>
-using namespace std;
 
 
 void compare_compare (std::string bible, std::string compare, int jobId)
@@ -67,12 +66,12 @@ void compare_compare (std::string bible, std::string compare, int jobId)
   std::vector <int> resourceBooks = database_usfmresources.getBooks (compare);
   std::vector <int> books;
   {
-    set <int> bookset;
+    std::set <int> bookset;
     bookset.insert (bibleBooks.begin(), bibleBooks.end());
     bookset.insert (compareBooks.begin(), compareBooks.end());
     bookset.insert (resourceBooks.begin(), resourceBooks.end());
     books.assign (bookset.begin(), bookset.end ());
-    sort (books.begin(), books.end());
+    std::sort (books.begin(), books.end());
   }
 
 
@@ -114,16 +113,16 @@ void compare_compare (std::string bible, std::string compare, int jobId)
     std::vector <int> resourceChapters = database_usfmresources.getChapters (compare, book);
     std::vector <int> chapters;
     {
-      set <int> chapterset;
+      std::set <int> chapterset;
       chapterset.insert (bibleChapters.begin(), bibleChapters.end());
       chapterset.insert (compareChapters.begin(), compareChapters.end());
       chapterset.insert (resourceChapters.begin(), resourceChapters.end());
       chapters.assign (chapterset.begin(), chapterset.end ());
-      sort (chapters.begin(), chapters.end());
+      std::sort (chapters.begin(), chapters.end());
     }
 
 
-    for (auto & chapter : chapters) {
+    for (const auto & chapter : chapters) {
 
 
       // Look for, report, and skip missing chapters in the source Bible.
@@ -156,15 +155,15 @@ void compare_compare (std::string bible, std::string compare, int jobId)
       std::vector <int> compare_verse_numbers = filter::usfm::get_verse_numbers (compare_chapter_usfm);
       std::vector <int> verses;
       {
-        set <int> verseset;
+        std::set <int> verseset;
         verseset.insert (bible_verse_numbers.begin(), bible_verse_numbers.end());
         verseset.insert (compare_verse_numbers.begin(), compare_verse_numbers.end());
         verses.assign (verseset.begin(), verseset.end ());
-        sort (verses.begin(), verses.end());
+        std::sort (verses.begin(), verses.end());
       }
 
 
-      for (int & verse : verses) {
+      for (const int & verse : verses) {
 
 
         // Get the USFM of verse of the Bible and comparison USFM, and skip it if both are the same.

config.h

@@ -22,7 +22,7 @@
 /* Define whether to compile for iOS */
 /* #undef HAVE_IOS */
 
-/* Define to 1 if you have the `mbedtls' library (-lmbedtls). */
+/* Define to 1 if you have the 'mbedtls' library (-lmbedtls). */
 /* #undef HAVE_LIBMBEDTLS */
 
 /* Define whether libproc.h is present */
@@ -106,7 +106,7 @@
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "5.1.012"
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #define STDC_HEADERS 1

config.h.in

@@ -21,7 +21,7 @@
 /* Define whether to compile for iOS */
 #undef HAVE_IOS
 
-/* Define to 1 if you have the `mbedtls' library (-lmbedtls). */
+/* Define to 1 if you have the 'mbedtls' library (-lmbedtls). */
 #undef HAVE_LIBMBEDTLS
 
 /* Define whether libproc.h is present */
@@ -105,7 +105,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #undef STDC_HEADERS