Merge branch 'develop'

corresponding issue: https://svn.boost.org/trac10/ticket/13125

include/boost/program_options/errors.hpp

@@ -110,13 +110,13 @@ namespace boost { namespace program_options {
         std::map<std::string, string_pair > m_substitution_defaults;
 
     public:
-		/** template with placeholders */
-		std::string m_error_template;
+        /** template with placeholders */
+        std::string m_error_template;
 
-		error_with_option_name(const std::string& template_,
-                              const std::string& option_name = "",
-                              const std::string& original_token = "",
-                              int option_style               = 0);
+        error_with_option_name(const std::string& template_,
+                               const std::string& option_name = "",
+                               const std::string& original_token = "",
+                               int option_style = 0);
 
         /** gcc says that throw specification on dtor is loosened 
          *  without this line                                     

src/parsers.cpp

@@ -152,7 +152,16 @@ namespace boost { namespace program_options {
         {
             boost::throw_exception(reading_file(filename));
         }
-        return parse_config_file(strm, desc, allow_unregistered);
+
+        basic_parsed_options<charT> result
+                = parse_config_file(strm, desc, allow_unregistered);
+
+        if (strm.bad())
+        {
+            boost::throw_exception(reading_file(filename));
+        }
+
+        return result;
     }
 
     template

test/Jamfile.v2

@@ -2,20 +2,20 @@ import testing ;
 
 project
     : requirements 
-    <library>/boost//program_options
+    <library>../build//boost_program_options
     <link>static
     <variant>debug
     
 #    <define>_GLIBCXX_CONCEPT_CHECKS
 #    <define>_GLIBCXX_DEBUG
     ;
-
+    
 rule po-test ( source : input-file ? )
 {
     return
         [ run $(source) : : $(input-file) ]
         [ run $(source) : : $(input-file) 
-          : <link>shared
+          : <link>shared <define>BOOST_PROGRAM_OPTIONS_DYN_LINK=1
           : $(source:B)_dll ] 
     ;   
 }    
@@ -37,7 +37,7 @@ test-suite program_options :
     [ po-test optional_test.cpp ]
     [ run options_description_test.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : options_description_no_rtti_test ]
     ;
-
+        
 exe test_convert : test_convert.cpp ;   
 
 # `quick` target (for CI)

test/exception_txt_test.cpp

@@ -152,7 +152,7 @@ void test_invalid_option_value_exception_msg()
 {
     options_description desc;
     desc.add_options()
-        ("int-option,d", value< int >(),	"An option taking an integer")
+        ("int-option,d", value< int >(),        "An option taking an integer")
     ;
 
     vector<vector<const char*> > argv;
@@ -308,7 +308,7 @@ void test_invalid_bool_value_exception_msg()
 {
     options_description desc; 
     desc.add_options()
-        ("bool_option,b",	value< bool>(),	"bool_option")
+        ("bool_option,b",       value< bool>(), "bool_option")
         ;