shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00
Code Releases Wiki Activity

feature #1617: Fix compilation issue, renamed constant

Browse Source
This commit is contained in:
Ruben S. Montero 2012-11-16 12:00:43 +01:00
parent f19debf505
commit 3c3830aeaf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Image.h
View File

@ -38,7 +38,7 @@ public:
OS = 0, /** < Base OS image */ OS = 0, /** < Base OS image */
CDROM = 1, /** < An ISO9660 image */ CDROM = 1, /** < An ISO9660 image */
DATABLOCK = 2, /** < User persistent data device */ DATABLOCK = 2, /** < User persistent data device */
FILE = 3 /** < Context, kernels and initrd files */ DATAFILE = 3 /** < Context, kernels and initrd files */
}; };
/** /**
@ -53,6 +53,7 @@ public:
case OS: return "OS" ; break; case OS: return "OS" ; break;
case CDROM: return "CDROM" ; break; case CDROM: return "CDROM" ; break;
case DATABLOCK: return "DATABLOCK" ; break; case DATABLOCK: return "DATABLOCK" ; break;
case DATAFILE: return "FILE" ; break;
default: return ""; default: return "";
} }
}; };

4
src/image/Image.cc
View File

@ -571,7 +571,7 @@ int Image::set_type(string& _type)
} }
else if ( _type == "FILE" ) else if ( _type == "FILE" )
{ {
type = FILE; type = DATAFILE;
} }
else else
{ {
@ -636,7 +636,7 @@ Image::ImageType Image::str_to_type(string& str_type)
} }
else if ( str_type == "FILE" ) else if ( str_type == "FILE" )
{ {
it = FILE; it = DATAFILE;
} }
return it; return it;