Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cdo
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
cdo
Commits
76712ba5
Commit
76712ba5
authored
4 months ago
by
Oliver Heidmann
Browse files
Options
Downloads
Patches
Plain Diff
removed name collision for enum member FILE, renamed to FILEIO
parent
641538ee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!289
M300433/python interaface integration 1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/process.cc
+1
-1
1 addition, 1 deletion
src/process.cc
src/process.h
+2
-2
2 additions, 2 deletions
src/process.h
with
3 additions
and
3 deletions
src/process.cc
+
1
−
1
View file @
76712ba5
...
...
@@ -327,7 +327,7 @@ Process::open_write(const std::string &p_filename, int filetype)
{
if
(
filetype
==
CDI_UNDEFID
)
filetype
=
cdo_filetype
();
if
(
write_mode
==
ProcessWriteMode
::
FILE
)
{
add_file_out_stream
(
p_filename
);
}
if
(
write_mode
==
ProcessWriteMode
::
FILE
IO
)
{
add_file_out_stream
(
p_filename
);
}
else
if
(
write_mode
==
ProcessWriteMode
::
MEMORY
)
{
auto
[
fid
,
sid
]
=
create_output
();
...
...
This diff is collapsed.
Click to expand it.
src/process.h
+
2
−
2
View file @
76712ba5
...
...
@@ -30,7 +30,7 @@ enum class ProcessStatus
};
enum
class
ProcessWriteMode
{
FILE
=
0
,
FILE
IO
=
0
,
MEMORY
=
1
};
...
...
@@ -44,7 +44,7 @@ private:
public:
/* Member Variables */
ProcessWriteMode
write_mode
=
ProcessWriteMode
::
FILE
;
ProcessWriteMode
write_mode
=
ProcessWriteMode
::
FILE
IO
;
int
m_ID
;
const
CdoModule
&
m_module
;
int
m_posInParent
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment