diff options
| author | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-03-28 11:37:12 -0500 |
| commit | ebb2c54975e3f0b7b891532e8e72d2ef760f96c4 (patch) | |
| tree | 973de7066457a1faddffd3834eb0c260d5191ec2 /java/constants.h | |
| parent | 168ed3e8e58a8e5065ffa720f8d45f4cee0f2069 (diff) | |
| parent | 1f13f0c665001a1a79f00cdad1e63e6c9802e55f (diff) | |
| download | MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.gz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.lz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.tar.xz MultiMC-ebb2c54975e3f0b7b891532e8e72d2ef760f96c4.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
Diffstat (limited to 'java/constants.h')
| -rw-r--r-- | java/constants.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/constants.h b/java/constants.h index 2f968d2e..61aa5687 100644 --- a/java/constants.h +++ b/java/constants.h @@ -7,7 +7,7 @@ namespace java class constant { public: - enum type_t:uint8_t + enum type_t : uint8_t { j_hole = 0, // HACK: this is a hole in the array, because java is crazy j_string_data = 1, @@ -22,6 +22,7 @@ namespace java j_interface_methodref = 11, j_nameandtype = 12 } type; + constant(util::membuffer & buf ) { buf.read(type); @@ -66,10 +67,12 @@ namespace java break; } } + constant(int fake) { type = j_hole; } + std::string toString() { std::ostringstream ss; @@ -143,6 +146,7 @@ namespace java } name_and_type; }; }; + /** * A helper class that represents the custom container used in Java class file for storage of constants */ @@ -181,7 +185,7 @@ namespace java index++; } } - }; + } typedef std::vector<java::constant> container_type; /** * Access constants based on jar file index numbers (index of the first element is 1) |