On Wed, Jun 18, 2014 at 4:41 PM, <jscipione@xxxxxxxxx> wrote: > hrev47402 adds 2 changesets to branch 'master' > old head: d2d1af830b3f144937ea5e4c3f0e5b74c4c3d737 > new head: b885e90eb96c5c2b629c81d35b7f9970db239995 > overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b885e90+%5Ed2d1af8 > > ---------------------------------------------------------------------------- > > a30a4a4: Style fixes to Storage Kit classes. > > No functional changes intended. > > * Some variable renaming for clarity and consistency. > * Pointer style fixes. > * Added private method documentation back to cpp files for some methods. > > b885e90: Documentation updates for Storage Kit classes > > * Added \since to each method and parameter. > * Whitespace cleanup. > * Some other minor cleanups and updates. > > [ John Scipione <jscipione@xxxxxxxxx> ] > > ---------------------------------------------------------------------------- > -#define B_ENTRY_CREATED 1 > -#define B_ENTRY_REMOVED 2 > -#define B_ENTRY_MOVED 3 > -#define B_STAT_CHANGED 4 > -#define B_ATTR_CHANGED 5 > -#define B_DEVICE_MOUNTED 6 > -#define B_DEVICE_UNMOUNTED 7 > +enum { > + B_ENTRY_CREATED = 1, > + B_ENTRY_REMOVED, > + B_ENTRY_MOVED, > + B_STAT_CHANGED, > + B_ATTR_CHANGED, > + B_DEVICE_MOUNTED, > + B_DEVICE_UNMOUNTED > +}; > > > // More specific info in the "cause" field of B_ATTR_CHANGED notification > // messages. (Haiku only) > -#define B_ATTR_CREATED 1 > -#define B_ATTR_REMOVED 2 > -// B_ATTR_CHANGED is reused > + > +enum { > + B_ATTR_CREATED = 1, > + B_ATTR_REMOVED, > +// B_ATTR_CHANGED > +}; This seems to have broke something... C++ /home/buildslave/haiku-master-x86/generated/objects/haiku/x86/release/add-ons/kernel/file_systems/bindfs/Node.o /home/buildslave/haiku/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp: In function 'status_t bfs_write_attr(fs_volume*, fs_vnode*, void*, off_t, const void*, size_t*)': /home/buildslave/haiku/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp:1891:32: error: enumeral mismatch in conditional expression: '<anonymous enum>' vs '<anonymous enum>' [-Werror=enum-compare] created ? B_ATTR_CREATED : B_ATTR_CHANGED); ^ C++ /home/buildslave/haiku-master-x86/generated/objects/haiku/x86/release/add-ons/kernel/file_systems/bindfs/Volume.o cc1plus: all warnings being treated as errors /home/buildslave/cross-tools-x86/cross-tools-x86/bin/i586-pc-haiku-gcc -c "/home/buildslave/haiku/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp" -O1 -Wall -Wno-trigraphs -Wno-multichar -Werror -Wno-error=uninitialized -Wno-unused-but-set-variable -pipe -fno-strict-aliasing -fno-tree-vrp -Wno-array-bounds -nostdinc -Wno-deprecated -DBFS_DEBUGGER_COMMANDS -pipe -fno-strict-aliasing -fno-tree-vrp -Wno-array-bounds -nostdinc -Wno-deprecated -pipe -fno-strict-aliasing -fno-tree-vrp -Wno-array-bounds -finline -fno-builtin -ffreestanding -fno-exceptions -fno-use-cxa-atexit -std=gnu++11 -march=pentium -D_KERNEL_MODE -DARCH_x86 -DB_USE_BUILTIN_ATOMIC_FUNCTIONS -DBOOT_ARCHIVE_IMAGE_OFFSET=300 -D__HAIKU_PRIMARY_PACKAGING_ARCH=\"x86\" -DHAIKU_DISTRO_COMPATIBILITY_OFFICIAL -DHAIKU_INCLUDE_PATENTED_CODE=0 -DHAIKU_TARGET_PLATFORM_HAIKU -DHAIKU_MINIMUM_BUILD -iquote /home/buildslave/haiku/build/user_config_headers -iquote /home/buildslave/haiku/build/config_headers -iquote /home/buildslave/haiku/src/add-ons/kernel/file_systems/bfs -iquote /home/buildslave/haiku-master-x86/generated/objects/common/add-ons/kernel/file_systems/bfs -iquote /home/buildslave/haiku-master-x86/generated/objects/linux/x86_64/common/add-ons/kernel/file_systems/bfs -iquote /home/buildslave/haiku-master-x86/generated/objects/haiku/x86/common/add-ons/kernel/file_systems/bfs -I /home/buildslave/haiku/headers/private/. -I /home/buildslave/haiku/headers/private/kernel -I /home/buildslave/haiku/headers/private/libroot -I /home/buildslave/haiku/headers/private/shared -I /home/buildslave/haiku/headers/private/kernel/boot/platform/bios_ia32 -I /home/buildslave/haiku/headers/private/kernel/arch/x86 -I /home/buildslave/haiku-master-x86/generated/objects/haiku/x86/common/system/kernel -I /home/buildslave/haiku/headers/private/. -I /home/buildslave/haiku/headers/private/system -I /home/buildslave/haiku/headers/private/system/arch/x86 -I /home/buildslave/haiku/headers/private/kernel/disk_device_manager -I /home/buildslave/haiku/headers/private/shared -I /home/buildslave/haiku/headers/private/storage -I /home/buildslave/cross-tools-x86/cross-tools-x86/lib/gcc/i586-pc-haiku/4.8.2/../../../../i586-pc-haiku/include/c++/4.8.2 -I /home/buildslave/cross-tools-x86/cross-tools-x86/lib/gcc/i586-pc-haiku/4.8.2/../../../../i586-pc-haiku/include/c++/4.8.2/i586-pc-haiku -I /home/buildslave/cross-tools-x86/cross-tools-x86/lib/gcc/i586-pc-haiku/4.8.2/../../../../i586-pc-haiku/include/c++/4.8.2/backward -I /home/buildslave/cross-tools-x86/cross-tools-x86/lib/gcc/i586-pc-haiku/4.8.2/../../../../i586-pc-haiku/include/c++/4.8.2/ext -I /home/buildslave/cross-tools-x86/cross-tools-x86/lib/gcc/i586-pc-haiku/4.8.2/include -I /home/buildslave/cross-tools-x86/cross-tools-x86/lib/gcc/i586-pc-haiku/4.8.2/include-fixed -I /home/buildslave/haiku/headers -I /home/buildslave/haiku/headers/posix -I /home/buildslave/haiku/headers/glibc -I /home/buildslave/haiku/headers/os -I /home/buildslave/haiku/headers/os/add-ons -I /home/buildslave/haiku/headers/os/add-ons/file_system -I /home/buildslave/haiku/headers/os/add-ons/graphics -I /home/buildslave/haiku/headers/os/add-ons/input_server -I /home/buildslave/haiku/headers/os/add-ons/registrar -I /home/buildslave/haiku/headers/os/add-ons/screen_saver -I /home/buildslave/haiku/headers/os/add-ons/tracker -I /home/buildslave/haiku/headers/os/app -I /home/buildslave/haiku/headers/os/device -I /home/buildslave/haiku/headers/os/drivers -I /home/buildslave/haiku/headers/os/game -I /home/buildslave/haiku/headers/os/interface -I /home/buildslave/haiku/headers/os/kernel -I /home/buildslave/haiku/headers/os/locale -I /home/buildslave/haiku/headers/os/media -I /home/buildslave/haiku/headers/os/mail -I /home/buildslave/haiku/headers/os/midi -I /home/buildslave/haiku/headers/os/midi2 -I /home/buildslave/haiku/headers/os/net -I /home/buildslave/haiku/headers/os/storage -I /home/buildslave/haiku/headers/os/support -I /home/buildslave/haiku/headers/os/translation -I /home/buildslave/haiku/headers/private/. -o "/home/buildslave/haiku-master-x86/generated/objects/haiku/x86/release/add-ons/kernel/file_systems/bfs/kernel_interface.o" ; ...failed C++ /home/buildslave/haiku-master-x86/generated/objects/haiku/x86/release/add-ons/kernel/file_systems/bfs/kernel_interface.o ...