mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Fixed merging leftovers.

Browse source
This commit is contained in:
Sergey Prigogin 2012-11-11 15:28:33 -08:00
parent 1c570e7bbb
commit 85b6bc8652
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
View file

@ -217,16 +217,14 @@ public class PDOM extends PlatformObject implements IPDOM {
* 123.0 - Combined file size and encoding hash code.
* 124.0 - GCC attributes and NO_RETURN flag for functions.
* #125.0# - Indexes for unresolved includes and files indexed with I/O errors. <<CDT 8.1>>
<<<<<<< cdt_8_1
<<<<<<< cdt_8_1
<<<<<<< cdt_8_1
* 126.0 - Dependent expressions, bug 299911.
* 127.0 - Explicit virtual overrides, bug 380623.
* 128.0 - Merged several changes affecting index from the master branch.
* 128.0 - Preservation of typedefs in template arguments.
* 129.0 - Merged several changes affecting index from the master branch.
*/
private static final int MIN_SUPPORTED_VERSION= version(128, 0);
private static final int MAX_SUPPORTED_VERSION= version(128, Short.MAX_VALUE);
private static final int DEFAULT_VERSION = version(128, 0);
private static final int MIN_SUPPORTED_VERSION= version(129, 0);
private static final int MAX_SUPPORTED_VERSION= version(129, Short.MAX_VALUE);
private static final int DEFAULT_VERSION = version(129, 0);
private static int version(int major, int minor) {
return (major << 16) + minor;