SF.net SVN: openvrml:[4258] branches/0.18

[<br...@us...>]

Revision: 4258
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4258&view=rev
Author:   braden
Date:     2012-04-26 06:57:32 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Applying the stream output operator to a boost::filesystem::path now yields a string within quotes; use boost::filesystem::path::generic_string instead.

Modified Paths:
--------------
    branches/0.18/ChangeLog
    branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp

Property Changed:
----------------
    branches/0.18/


Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257

Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog	2012-04-26 06:55:28 UTC (rev 4257)
+++ branches/0.18/ChangeLog	2012-04-26 06:57:32 UTC (rev 4258)
@@ -1,3 +1,12 @@
+2012-04-26 Braden McDaniel  <br...@en...>
+
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(openvrml::local::dl::foreachfile(const
+	std::vector<boost::filesystem::path> &, int (*)(const std::string
+	&, void *), void *): Applying the stream output operator to a
+	boost::filesystem::path now yields a string within quotes; use
+	boost::filesystem::path::generic_string instead.
+
 2012-04-23 Braden McDaniel  <br...@en...>
 
 	Quell warnings from gcc 4.7.

Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-04-26 06:55:28 UTC (rev 4257)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-04-26 06:57:32 UTC (rev 4258)
@@ -85,7 +85,7 @@
     std::vector<boost::filesystem::path>::const_iterator dir =
         search_path.begin();
     while (dir != search_path.end()) {
-        path << *dir;
+        path << dir->generic_string();
         if (++dir != search_path.end()) { path << LT_PATHSEP_CHAR; }
     }
     ltforeachfile_data ltdata = { func, data };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.