update to account for coda-oss changes

Dan Smith · Dan Smith · commit 90be0243a2d3 · 2022-01-17T09:54:33.000-05:00
diff --git a/six/modules/c++/six/include/six/Init.h b/six/modules/c++/six/include/six/Init.h
@@ -144,7 +144,7 @@ namespace details
 {
     inline void throw_undefined_value()
     {
-        sys::details::throw_bad_optional_access();
+        coda_oss::details::throw_bad_optional_access();
     }
 }
 
diff --git a/six/projects/csm/external/vts_301_0/source/vts_isd.cpp b/six/projects/csm/external/vts_301_0/source/vts_isd.cpp
@@ -380,7 +380,7 @@ static FILE * fillBuff_expand_(std::string& fname,
 {
     // If we're here, the orignal call to fillBuff_() failed; assume that's because
     // the path needs to be expanded.
-    auto path = sys::Path::expandEnvironmentVariables(fname, sys::Filesystem::file_type::regular);
+    auto path = sys::Path::expandEnvironmentVariables(fname, coda_oss::filesystem::file_type::regular);
     try
     {
         FILE* retval = fillBuff_(path, statbuf, buff);

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ namespace details`
`144`	`144`	`{`
`145`	`145`	`inline void throw_undefined_value()`
`146`	`146`	`{`
`147`		`- sys::details::throw_bad_optional_access();`
	`147`	`+ coda_oss::details::throw_bad_optional_access();`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ static FILE * fillBuff_expand_(std::string& fname,`
`380`	`380`	`{`
`381`	`381`	`// If we're here, the orignal call to fillBuff_() failed; assume that's because`
`382`	`382`	`// the path needs to be expanded.`
`383`		`- auto path = sys::Path::expandEnvironmentVariables(fname, sys::Filesystem::file_type::regular);`
	`383`	`+ auto path = sys::Path::expandEnvironmentVariables(fname, coda_oss::filesystem::file_type::regular);`
`384`	`384`	`try`
`385`	`385`	`{`
`386`	`386`	`FILE* retval = fillBuff_(path, statbuf, buff);`