diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:44:46 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:44:46 (GMT) |
| commit | 10c7607541e502f2d0ff7c2c49fd70809704c039 (patch) | |
| tree | 668b8ff9ff4604e753d32ad29decb82f36a63313 /src/dxfdim.cc | |
| parent | 9f6819e68501de16563aeaaadd65dfc915092169 (diff) | |
more eigen3 fixes.
1. finish converting 'using namespace boost::filsystem' to 'namespace fs = boost::filesystem'.
2. initial version of changes to CMakelists.txt for the regression test
Diffstat (limited to 'src/dxfdim.cc')
| -rw-r--r-- | src/dxfdim.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/dxfdim.cc b/src/dxfdim.cc index 4af3526..dfe8c13 100644 --- a/src/dxfdim.cc +++ b/src/dxfdim.cc @@ -72,7 +72,6 @@ Value builtin_dxf_dim(const Context *ctx, const std::vector<std::string> &argnam return dxf_dim_cache.find(key)->second; DxfData dxf(36, 0, 0, filename, layername, xorigin, yorigin, scale); -/* for (size_t i = 0; i < dxf.dims.size(); i++) { @@ -124,13 +123,12 @@ Value builtin_dxf_dim(const Context *ctx, const std::vector<std::string> &argnam PRINTB("WARNING: Can't find dimension '%s' in '%s', layer '%s'!", name % filename % layername); -*/ return Value(); } Value builtin_dxf_cross(const Context *ctx, const std::vector<std::string> &argnames, const std::vector<Value> &args) { -/* std::string filename; + std::string filename; std::string layername; double xorigin = 0; double yorigin = 0; @@ -149,8 +147,8 @@ Value builtin_dxf_cross(const Context *ctx, const std::vector<std::string> &argn std::stringstream keystream; keystream << filename << "|" << layername << "|" << xorigin << "|" << yorigin - << "|" << scale << "|" << last_write_time(filename) - << "|" << file_size(filename); + << "|" << scale << "|" << fs::last_write_time(filename) + << "|" << fs::file_size(filename); std::string key = keystream.str(); if (dxf_cross_cache.find(key) != dxf_cross_cache.end()) @@ -188,7 +186,6 @@ Value builtin_dxf_cross(const Context *ctx, const std::vector<std::string> &argn } PRINTB("WARNING: Can't find cross in '%s', layer '%s'!", filename % layername); -*/ return Value(); } |