Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into render_vector

  • Loading branch information...
2 parents 8f73ce6 + b38310a commit 922e6c47e8897245c27ea0449d3dd01f1bae57e6 @clothbot committed Mar 20, 2012
View
@@ -152,7 +152,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -125,7 +125,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
@@ -111,7 +111,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -104,7 +104,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
AbstractNode *absolute_root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -91,7 +91,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -276,7 +276,9 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
}
if (!sysinfo_dump) {
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
}
AbstractNode::resetIndexCounter();
View
@@ -95,7 +95,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -101,7 +101,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -103,7 +103,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
root_node = root_module->evaluate(&root_ctx, &root_inst);
View
@@ -92,7 +92,9 @@ int main(int argc, char **argv)
exit(1);
}
- fs::current_path(fs::path(filename).parent_path());
+ if (fs::path(filename).has_parent_path()) {
+ fs::current_path(fs::path(filename).parent_path());
+ }
AbstractNode::resetIndexCounter();
root_node = root_module->evaluate(&root_ctx, &root_inst);

0 comments on commit 922e6c4

Please sign in to comment.