← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mapnik/trusty-proposed

« back to all changes in this revision

Viewing changes to include/mapnik/ptree_helpers.hpp

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Sauthier
  • Date: 2009-08-27 00:28:37 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090827002837-ztqzfg2rmclfh4i9
Tags: 0.6.1-0ubuntu1
* New upstream release.
* Change usr/lib to usr/lib* to enable build on 64 bits systems due to new
  configuration in SConstruct in :
  - debian/libmapnik-dev.install
  - debian/libmapnik0.6.install
  - debian/mapnik-plugin-base

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/mapnik/ptree_helpers.hpp
91
91
      }
92
92
      catch (...)
93
93
      {
94
 
         throw config_error(string("Failed to parse ") +
95
 
                            
96
 
                            name + "'. Expected CSS color"  +
97
 
                            " but got '" + str + "'");
 
94
          throw config_error(std::string("Failed to parse ") +
 
95
                             name + "'. Expected CSS color"  +
 
96
                             " but got '" + str + "'");
98
97
      }
99
98
   }
100
99
   
266
265
            }
267
266
            catch (const boost::bad_lexical_cast & )
268
267
            {
269
 
                throw config_error(string("Failed to parse ") +
 
268
                throw config_error(std::string("Failed to parse ") +
270
269
                        (is_attribute ? "attribute" : "child node") + " '" +
271
270
                        name + "'. Expected " + name_trait<T>::name() +
272
271
                        " but got '" + *str + "'");
298
297
         }
299
298
         catch (...)
300
299
         {
301
 
            throw config_error(string("Failed to parse ") +
302
 
                               (is_attribute ? "attribute" : "child node") + " '" +
303
 
                               name + "'. Expected " + name_trait<color>::name() +
304
 
                               " but got '" + *str + "'");
 
300
             throw config_error(std::string("Failed to parse ") +
 
301
                                (is_attribute ? "attribute" : "child node") + " '" +
 
302
                                name + "'. Expected " + name_trait<color>::name() +
 
303
                                " but got '" + *str + "'");
305
304
         }
306
305
      } 
307
306
      else 
324
323
        }
325
324
 
326
325
        if ( ! str ) {
327
 
            throw config_error(string("Required ") +
 
326
            throw config_error(std::string("Required ") +
328
327
                    (is_attribute ? "attribute " : "child node ") +
329
328
                    "'" + name + "' is missing");
330
329
        }
334
333
        }
335
334
        catch (const boost::bad_lexical_cast & )
336
335
        {
337
 
            throw config_error(string("Failed to parse ") +
 
336
            throw config_error(std::string("Failed to parse ") +
338
337
                    (is_attribute ? "attribute" : "child node") + " '" +
339
338
                    name + "'. Expected " + name_trait<T>::name() +
340
339
                    " but got '" + *str + "'");
350
349
        }
351
350
        catch (...)
352
351
        {
353
 
            throw config_error(string("Failed to parse ") +
 
352
            throw config_error(std::string("Failed to parse ") +
354
353
                    name + ". Expected " + name_trait<T>::name() +
355
354
                    " but got '" + node.data() + "'");
356
355
        }
379
378
           }
380
379
           catch (const boost::bad_lexical_cast &)
381
380
           {
382
 
              throw config_error(string("Failed to parse ") +
 
381
               throw config_error(std::string("Failed to parse ") +
383
382
                                 (is_attribute ? "attribute" : "child node") + " '" +
384
383
                                 name + "'. Expected " + name_trait<T>::name() +
385
384
                                 " but got '" + *str + "'");
414
413
           }
415
414
           catch (...)
416
415
           {
417
 
              throw config_error(string("Failed to parse ") +
418
 
                                 (is_attribute ? "attribute" : "child node") + " '" +
419
 
                                 name + "'. Expected " + name_trait<color>::name() +
420
 
                                 " but got '" + *str + "'");
 
416
               throw config_error(std::string("Failed to parse ") +
 
417
                                  (is_attribute ? "attribute" : "child node") + " '" +
 
418
                                  name + "'. Expected " + name_trait<color>::name() +
 
419
                                  " but got '" + *str + "'");
421
420
           }  
422
421
        }
423
422