Skip to content

Commit b5e9331

Browse files
committedFeb 4, 2025
TensorVis,NanoVGUtils: warn/compile fixes
1 parent 2bc497a commit b5e9331

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed
 

‎misc/nanovgutils/include/inviwo/nanovgutils/nanovgcontext.h

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
#include <nanovg.h>
4141
#include <warn/pop>
4242

43+
#include <filesystem>
44+
4345
namespace inviwo {
4446
class IVW_MODULE_NANOVGUTILS_API NanoVGContext {
4547
friend class NanoVGUtilsModule;

‎tensorvis/tensorvisbase/include/inviwo/tensorvisbase/tensorvisbasemoduledefine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
#define IVW_MODULE_TENSORVISBASE_API
2323
#endif
2424

25-
#endif /* _IVW_MODULE_TENSORVISBASE_DEFINE_H_ */
25+
#endif /* _IVW_MODULE_TENSORVISBASE_DEFINE_H_ */

‎tensorvis/tensorvisbase/include/inviwo/tensorvisbase/util/tensorutil.h

+2-10
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929

3030
#pragma once
3131

32-
//#include <warn/push>
33-
//#include <warn/ignore/all>
34-
//#include <Eigen/Dense>
35-
//#include <warn/pop>
36-
//#include <inviwo/core/datastructures/geometry/basicmesh.h>
37-
//#include <modules/opengl/shader/shaderutils.h>
3832
#include <inviwo/tensorvisbase/tensorvisbasemoduledefine.h>
3933

4034
#include <inviwo/core/datastructures/geometry/geometrytype.h>
@@ -43,8 +37,7 @@
4337

4438
#include <iostream>
4539

46-
namespace inviwo {
47-
namespace tensorutil {
40+
namespace inviwo::tensorutil {
4841

4942
enum class Anisotropy {
5043
abs_lamda1_minus_lamda2,
@@ -221,6 +214,5 @@ static const std::string j2_str{"J₂"};
221214
static const std::string j3_str{"J₃"};
222215

223216
static const std::string tau_str{"τ"};
224-
} // namespace tensorutil
225217

226-
} // namespace inviwo
218+
} // namespace inviwo::tensorutil

0 commit comments

Comments
 (0)