From 90a2c93e50c2b3b52d95052de0f8daea142b49c1 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 1 Apr 2003 08:47:11 +0000
Subject: [PATCH] Added extra debugging messages into the
 ArgumentParser::reportRemainingOptionsAsUnrecognized(ErrorSeverity severity)
 method to help track down a crash under x86-64.

---
 src/osg/ArgumentParser.cpp | 41 ++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/osg/ArgumentParser.cpp b/src/osg/ArgumentParser.cpp
index 69247a6d9..efa043f46 100644
--- a/src/osg/ArgumentParser.cpp
+++ b/src/osg/ArgumentParser.cpp
@@ -1,8 +1,9 @@
-#include <iostream>
 #include <osg/ArgumentParser>
 #include <osg/ApplicationUsage>
+#include <osg/Notify>
 
 #include <set>
+#include <iostream>
 
 using namespace osg;
 
@@ -293,10 +294,42 @@ void ArgumentParser::reportRemainingOptionsAsUnrecognized(ErrorSeverity severity
             unsigned int prevpos = 0, pos = 0;
             while ((pos=option.find(' ',prevpos))!=std::string::npos)
             {
-                if (option[prevpos]=='-') options.insert(std::string(option,prevpos,pos-prevpos));
+                if (option[prevpos]=='-') 
+                {
+                    // verbose approach implemented for debugging string(const string&,unsigned int,unsigned int) operation on x86-64
+                    notify(INFO)<<"option=\""<<option<<"\" \tprevpos="<<prevpos<<" \tn="<<pos-prevpos;
+
+                    std::string str(option,prevpos,pos-prevpos);
+                    
+                    notify(INFO)<<" \tstr=\""<<str<<"\"";
+                    
+                    options.insert(str);
+                    
+                    notify(INFO)<<" \tinserted into options set"<<std::endl;
+                    
+                    
+                    // original op which causes a crash under x86-64
+                    //options.insert(std::string(option,prevpos,pos-prevpos));
+                }
                 prevpos=pos+1;
             }
-            if (option[prevpos]=='-') options.insert(std::string(option,prevpos,std::string::npos));
+            if (option[prevpos]=='-') 
+            {
+
+                // verbose approach implemented for debugging string(const string&,unsigned int,unsigned int) operation on x86-64
+                notify(INFO)<<"option=\""<<option<<"\"  \tprevpos="<<prevpos<<" \tn=npos";
+
+                std::string str(option,prevpos,pos-prevpos);
+
+                notify(INFO)<<" \tstr=\""<<str<<"\"";
+
+                options.insert(str);
+
+                notify(INFO)<<" \tinserted into options set"<<std::endl;
+
+                // original op
+                //options.insert(std::string(option,prevpos,std::string::npos));
+            }
         }
         
     }
@@ -318,7 +351,7 @@ void ArgumentParser::writeErrorMessages(std::ostream& output,ErrorSeverity sever
     {
         if (itr->second>=severity)
         {
-			output<< getProgramName() << ": " << itr->first << std::endl;
+            output<< getProgramName() << ": " << itr->first << std::endl;
         }
     }
 }