From e26988d4596bd9d26f1f3d1eb69db0bbc4936dfa Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Wed, 17 Dec 2003 06:16:38 +0000
Subject: [PATCH] Fix some C++-style comments. Pass -pedantic when compiling
 with gcc, so that such problems are reported.

[SVN r21298]
---
 historic/jam/src/build.jam  |  2 +-
 historic/jam/src/execunix.c |  2 +-
 historic/jam/src/fileunix.c |  4 ++--
 historic/jam/src/pathunix.c | 26 +++++++++++++-------------
 jam_src/build.jam           |  2 +-
 jam_src/execunix.c          |  2 +-
 jam_src/fileunix.c          |  4 ++--
 jam_src/pathunix.c          | 26 +++++++++++++-------------
 8 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/historic/jam/src/build.jam b/historic/jam/src/build.jam
index b0109d63e..14cf9e6ea 100644
--- a/historic/jam/src/build.jam
+++ b/historic/jam/src/build.jam
@@ -96,7 +96,7 @@ toolset darwin cc :  "-o " : -D
     [ opt --debug : -g -O0 -fno-inline -pg ] ;
 ## GCC 2.x, 3.x
 toolset gcc gcc : "-o " : -D
-    :
+    : -pedantic
     [ opt --release : [ opt --symbols : -g : -s ] -O3 -finline-functions ]
     [ opt --debug : -g -O0 -fno-inline ] ;
 ## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
diff --git a/historic/jam/src/execunix.c b/historic/jam/src/execunix.c
index 1861cd400..e450fdd12 100644
--- a/historic/jam/src/execunix.c
+++ b/historic/jam/src/execunix.c
@@ -10,7 +10,7 @@
 # include <errno.h>
 
 #if defined(sun) || defined(__sun)
-#include <unistd.h> // need to include unistd.h on sun for the vfork prototype
+#include <unistd.h> /* need to include unistd.h on sun for the vfork prototype*/
 #include <wait.h>
 #endif
 
diff --git a/historic/jam/src/fileunix.c b/historic/jam/src/fileunix.c
index 896b4f8b3..a2b9bbf19 100644
--- a/historic/jam/src/fileunix.c
+++ b/historic/jam/src/fileunix.c
@@ -19,13 +19,13 @@
 # include <stdio.h>
 
 #if defined(sun) || defined(__sun)
-# include <unistd.h> // needed for read and close prototype
+# include <unistd.h> /* needed for read and close prototype */
 #endif
 
 # ifdef USE_FILEUNIX
 
 #if defined(sun) || defined(__sun)
-# include <unistd.h> // needed for read and close prototype
+# include <unistd.h> /* needed for read and close prototype */
 #endif
 
 # if defined( OS_SEQUENT ) || \
diff --git a/historic/jam/src/pathunix.c b/historic/jam/src/pathunix.c
index ced341d40..36b2e59b9 100644
--- a/historic/jam/src/pathunix.c
+++ b/historic/jam/src/pathunix.c
@@ -286,17 +286,17 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
     DWORD pos=0, prev_pos=0;
     DWORD len=_tcslen(lpszShortPath);
 
-    // Is the string valid?
+    /* Is the string valid? */
     if (!lpszShortPath) {
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;  
     }
 
-    // Is the path valid?
+    /* Is the path valid? */
     if (GetFileAttributes(lpszShortPath)==INVALID_FILE_ATTRIBUTES)
         return 0;
 
-    // Convert "/" to "\"
+    /* Convert "/" to "\" */
     for (i=0;i<len;++i) {
         if (lpszShortPath[i]==_T('/')) 
             path[i]=_T('\\');
@@ -304,7 +304,7 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
             path[i]=lpszShortPath[i];
     }
 
-    // UNC path?
+    /* UNC path? */
     if (path[0]==_T('\\') && path[1]==_T('\\')) {
         pos=2;
         for (i=0;i<2;++i) {
@@ -313,7 +313,7 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
             ++pos;
         }
         _tcsncpy(ret,path,pos-1);
-    } // Drive letter?
+    } /* Drive letter? */
     else if (path[1]==_T(':')) {
         if (path[2]==_T('\\'))
             pos=3;
@@ -325,7 +325,7 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
         _tcsncpy(ret,path,2);
     }
     
-    // Expand the path for each subpath, and strip trailing backslashes
+    /* Expand the path for each subpath, and strip trailing backslashes */
     for (prev_pos = pos-1;pos<=len;++pos) {
         if (path[pos]==_T('\\') || (path[pos]==_T('\0') &&
                                     path[pos-1]!=_T('\\'))) {
@@ -335,20 +335,20 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
             char* new_element;
             path[pos]=_T('\0');
 
-            // the path[prev_pos+1]... path[pos] range is the part of
-            // path we're handling right now. We need to find long
-            // name for that element and add it.
+            /* the path[prev_pos+1]... path[pos] range is the part of
+               path we're handling right now. We need to find long
+               name for that element and add it. */
             new_element = path + prev_pos + 1;
 
-            // First add separator, but only if there's something in result already.
+            /* First add separator, but only if there's something in result already. */
             if (ret[0] != _T('\0'))
             {
                 _tcscat(ret,_T("\\"));
             }
 
-            // If it's ".." element, we need to append it, not
-            // the name in parent that FindFirstFile will return.
-            // Same goes for "."
+            /* If it's ".." element, we need to append it, not
+               the name in parent that FindFirstFile will return.
+               Same goes for "." */
             
             if (new_element[0] == _T('.') && new_element[1] == _T('\0') ||
                 new_element[0] == _T('.') && new_element[1] == _T('.') 
diff --git a/jam_src/build.jam b/jam_src/build.jam
index b0109d63e..14cf9e6ea 100644
--- a/jam_src/build.jam
+++ b/jam_src/build.jam
@@ -96,7 +96,7 @@ toolset darwin cc :  "-o " : -D
     [ opt --debug : -g -O0 -fno-inline -pg ] ;
 ## GCC 2.x, 3.x
 toolset gcc gcc : "-o " : -D
-    :
+    : -pedantic
     [ opt --release : [ opt --symbols : -g : -s ] -O3 -finline-functions ]
     [ opt --debug : -g -O0 -fno-inline ] ;
 ## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
diff --git a/jam_src/execunix.c b/jam_src/execunix.c
index 1861cd400..e450fdd12 100644
--- a/jam_src/execunix.c
+++ b/jam_src/execunix.c
@@ -10,7 +10,7 @@
 # include <errno.h>
 
 #if defined(sun) || defined(__sun)
-#include <unistd.h> // need to include unistd.h on sun for the vfork prototype
+#include <unistd.h> /* need to include unistd.h on sun for the vfork prototype*/
 #include <wait.h>
 #endif
 
diff --git a/jam_src/fileunix.c b/jam_src/fileunix.c
index 896b4f8b3..a2b9bbf19 100644
--- a/jam_src/fileunix.c
+++ b/jam_src/fileunix.c
@@ -19,13 +19,13 @@
 # include <stdio.h>
 
 #if defined(sun) || defined(__sun)
-# include <unistd.h> // needed for read and close prototype
+# include <unistd.h> /* needed for read and close prototype */
 #endif
 
 # ifdef USE_FILEUNIX
 
 #if defined(sun) || defined(__sun)
-# include <unistd.h> // needed for read and close prototype
+# include <unistd.h> /* needed for read and close prototype */
 #endif
 
 # if defined( OS_SEQUENT ) || \
diff --git a/jam_src/pathunix.c b/jam_src/pathunix.c
index ced341d40..36b2e59b9 100644
--- a/jam_src/pathunix.c
+++ b/jam_src/pathunix.c
@@ -286,17 +286,17 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
     DWORD pos=0, prev_pos=0;
     DWORD len=_tcslen(lpszShortPath);
 
-    // Is the string valid?
+    /* Is the string valid? */
     if (!lpszShortPath) {
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;  
     }
 
-    // Is the path valid?
+    /* Is the path valid? */
     if (GetFileAttributes(lpszShortPath)==INVALID_FILE_ATTRIBUTES)
         return 0;
 
-    // Convert "/" to "\"
+    /* Convert "/" to "\" */
     for (i=0;i<len;++i) {
         if (lpszShortPath[i]==_T('/')) 
             path[i]=_T('\\');
@@ -304,7 +304,7 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
             path[i]=lpszShortPath[i];
     }
 
-    // UNC path?
+    /* UNC path? */
     if (path[0]==_T('\\') && path[1]==_T('\\')) {
         pos=2;
         for (i=0;i<2;++i) {
@@ -313,7 +313,7 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
             ++pos;
         }
         _tcsncpy(ret,path,pos-1);
-    } // Drive letter?
+    } /* Drive letter? */
     else if (path[1]==_T(':')) {
         if (path[2]==_T('\\'))
             pos=3;
@@ -325,7 +325,7 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
         _tcsncpy(ret,path,2);
     }
     
-    // Expand the path for each subpath, and strip trailing backslashes
+    /* Expand the path for each subpath, and strip trailing backslashes */
     for (prev_pos = pos-1;pos<=len;++pos) {
         if (path[pos]==_T('\\') || (path[pos]==_T('\0') &&
                                     path[pos-1]!=_T('\\'))) {
@@ -335,20 +335,20 @@ DWORD ShortPathToLongPath(LPCTSTR lpszShortPath,LPTSTR lpszLongPath,DWORD
             char* new_element;
             path[pos]=_T('\0');
 
-            // the path[prev_pos+1]... path[pos] range is the part of
-            // path we're handling right now. We need to find long
-            // name for that element and add it.
+            /* the path[prev_pos+1]... path[pos] range is the part of
+               path we're handling right now. We need to find long
+               name for that element and add it. */
             new_element = path + prev_pos + 1;
 
-            // First add separator, but only if there's something in result already.
+            /* First add separator, but only if there's something in result already. */
             if (ret[0] != _T('\0'))
             {
                 _tcscat(ret,_T("\\"));
             }
 
-            // If it's ".." element, we need to append it, not
-            // the name in parent that FindFirstFile will return.
-            // Same goes for "."
+            /* If it's ".." element, we need to append it, not
+               the name in parent that FindFirstFile will return.
+               Same goes for "." */
             
             if (new_element[0] == _T('.') && new_element[1] == _T('\0') ||
                 new_element[0] == _T('.') && new_element[1] == _T('.')