Changeset 2045 for trunk/symbol_table


Ignore:
Timestamp:
Apr 23, 2012, 3:49:48 PM (7 years ago)
Author:
ksherdy
Message:

Revered TYPE and LGTH template parameters.

Location:
trunk/symbol_table
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/src/hash_table.hpp

    r2040 r2045  
    498498
    499499/* Length specific comparison */
    500 template<class T, uint32_t LGTH>
     500template<uint32_t LGTH, class TYPE>
    501501class identity_strategy_t: public compare_strategy {
    502502public:
    503503    static IDISA_ALWAYS_INLINE bool compare(uint8_t * x, uint8_t * y, const uint32_t lgth=0) {
    504         return overlap_compare<T,LGTH>(x,y);
     504        return overlap_compare<LGTH, TYPE>(x,y);
    505505    }
    506506};
  • trunk/symbol_table/src/id_symbol_table.hpp

    r2040 r2045  
    9595                        // Byte Space Hash
    9696                        ///////////////////////////////////////////////////////////////////////////////
    97                         #define BYTE_HASH(LENGTH_GROUP, COMPARISON_TYPE) \
    98                                 if(bitblock::any(groups.ends_##LENGTH_GROUP)) { \
    99                                         do_block<SYMBOL, hash_table <identity_strategy_t<COMPARISON_TYPE,LENGTH_GROUP>, hash_strategy_t<LENGTH_GROUP>, ALLOCATOR> > \
     97                        #define BYTE_HASH(LGTH, TYPE) \
     98                                if(bitblock::any(groups.ends_##LGTH)) { \
     99                                        do_block<SYMBOL, hash_table <identity_strategy_t<LGTH,TYPE>, hash_strategy_t<LGTH>, ALLOCATOR> > \
    100100                                                (blk_offset, \
    101                                                  hash_table_##LENGTH_GROUP, \
    102                                                  groups.ends_##LENGTH_GROUP, \
    103                                                  buffer, LENGTH_GROUP, /* buffer, symbol length */ \
    104                                                  buffer, buffer, bytes2bits(LENGTH_GROUP), BLOCK_SIZE, /* h0, h1, hash lgth (bits), hash block size (bits) */ \
     101                                                 hash_table_##LGTH, \
     102                                                 groups.ends_##LGTH, \
     103                                                 buffer, LGTH, /* buffer, symbol length */ \
     104                                                 buffer, buffer, bytes2bits(LGTH), BLOCK_SIZE, /* h0, h1, hash lgth (bits), hash block size (bits) */ \
    105105                                                 symbols, this->gid_factory, this->gid_data); \
    106106                                }
     
    119119                        // Bit Space Hash
    120120                        ///////////////////////////////////////////////////////////////////////////////
    121                         #define BIT_HASH(LENGTH_GROUP, COMPARISON_TYPE) \
    122                                 if(bitblock::any(groups.ends_##LENGTH_GROUP)) { \
    123                                         do_block<SYMBOL, hash_table <identity_strategy_t<COMPARISON_TYPE, LENGTH_GROUP>, hash_strategy_t<LENGTH_GROUP>, ALLOCATOR> > \
     121                        #define BIT_HASH(LGTH, TYPE) \
     122                                if(bitblock::any(groups.ends_##LGTH)) { \
     123                                        do_block<SYMBOL, hash_table <identity_strategy_t<LGTH,TYPE>, hash_strategy_t<LGTH>, ALLOCATOR> > \
    124124                                                (blk_offset, \
    125                                                  hash_table_##LENGTH_GROUP, \
    126                                                  groups.ends_##LENGTH_GROUP, \
    127                                                  buffer, LENGTH_GROUP, \
    128                                                  (uint8_t *)h0, (uint8_t *)h1, LENGTH_GROUP, (BLOCK_SIZE / 8), \
     125                                                 hash_table_##LGTH, \
     126                                                 groups.ends_##LGTH, \
     127                                                 buffer, LGTH, \
     128                                                 (uint8_t *)h0, (uint8_t *)h1, LGTH, (BLOCK_SIZE / 8), \
    129129                                                 symbols, this->gid_factory, this->gid_data); \
    130130                                }
     
    157157        // Byte Space Hash
    158158        ///////////////////////////////////////////////////////////////////////////////
    159         hash_table<identity_strategy_t<uint8_t,1>, hash_strategy_t<1>, ALLOCATOR> hash_table_1;
    160         hash_table<identity_strategy_t<uint16_t,2>, hash_strategy_t<2>, ALLOCATOR> hash_table_2;
    161         hash_table<identity_strategy_t<uint16_t,3>, hash_strategy_t<3>, ALLOCATOR> hash_table_3;
    162         hash_table<identity_strategy_t<uint32_t,4>, hash_strategy_t<4>, ALLOCATOR> hash_table_4;
    163         hash_table<identity_strategy_t<uint32_t,5>, hash_strategy_t<5>, ALLOCATOR> hash_table_5;
    164         hash_table<identity_strategy_t<uint32_t,6>, hash_strategy_t<6>, ALLOCATOR> hash_table_6;
    165         hash_table<identity_strategy_t<uint32_t,7>, hash_strategy_t<7>, ALLOCATOR> hash_table_7;
     159        hash_table<identity_strategy_t<1, uint8_t>, hash_strategy_t<1>, ALLOCATOR> hash_table_1;
     160        hash_table<identity_strategy_t<2, uint16_t>, hash_strategy_t<2>, ALLOCATOR> hash_table_2;
     161        hash_table<identity_strategy_t<3, uint16_t>, hash_strategy_t<3>, ALLOCATOR> hash_table_3;
     162        hash_table<identity_strategy_t<4, uint32_t>, hash_strategy_t<4>, ALLOCATOR> hash_table_4;
     163        hash_table<identity_strategy_t<5, uint32_t>, hash_strategy_t<5>, ALLOCATOR> hash_table_5;
     164        hash_table<identity_strategy_t<6, uint32_t>, hash_strategy_t<6>, ALLOCATOR> hash_table_6;
     165        hash_table<identity_strategy_t<7, uint32_t>, hash_strategy_t<7>, ALLOCATOR> hash_table_7;
    166166        ///////////////////////////////////////////////////////////////////////////////
    167167        // Bit Space Hash
    168168        ///////////////////////////////////////////////////////////////////////////////
    169         hash_table<identity_strategy_t<uint64_t,8>, hash_strategy_t<8>, ALLOCATOR> hash_table_8;
    170         hash_table<identity_strategy_t<uint64_t,9>, hash_strategy_t<9>, ALLOCATOR> hash_table_9;
    171         hash_table<identity_strategy_t<uint64_t,10>, hash_strategy_t<10>, ALLOCATOR> hash_table_10;
    172         hash_table<identity_strategy_t<uint64_t,11>, hash_strategy_t<11>, ALLOCATOR> hash_table_11;
    173         hash_table<identity_strategy_t<uint64_t,12>, hash_strategy_t<12>, ALLOCATOR> hash_table_12;
    174         hash_table<identity_strategy_t<uint64_t,13>, hash_strategy_t<13>, ALLOCATOR> hash_table_13;
    175         hash_table<identity_strategy_t<uint64_t,14>, hash_strategy_t<14>, ALLOCATOR> hash_table_14;
    176         hash_table<identity_strategy_t<uint64_t,15>, hash_strategy_t<15>, ALLOCATOR> hash_table_15;
    177         hash_table<identity_strategy_t<BitBlock,16>, hash_strategy_t<16>, ALLOCATOR> hash_table_16;
     169        hash_table<identity_strategy_t<8, uint64_t>, hash_strategy_t<8>, ALLOCATOR> hash_table_8;
     170        hash_table<identity_strategy_t<9, uint64_t>, hash_strategy_t<9>, ALLOCATOR> hash_table_9;
     171        hash_table<identity_strategy_t<10, uint64_t>, hash_strategy_t<10>, ALLOCATOR> hash_table_10;
     172        hash_table<identity_strategy_t<11, uint64_t>, hash_strategy_t<11>, ALLOCATOR> hash_table_11;
     173        hash_table<identity_strategy_t<12, uint64_t>, hash_strategy_t<12>, ALLOCATOR> hash_table_12;
     174        hash_table<identity_strategy_t<13, uint64_t>, hash_strategy_t<13>, ALLOCATOR> hash_table_13;
     175        hash_table<identity_strategy_t<14, uint64_t>, hash_strategy_t<14>, ALLOCATOR> hash_table_14;
     176        hash_table<identity_strategy_t<15, uint64_t>, hash_strategy_t<15>, ALLOCATOR> hash_table_15;
     177        hash_table<identity_strategy_t<16, BitBlock>, hash_strategy_t<16>, ALLOCATOR> hash_table_16;
    178178        hash_table<identity_strategy_d, hash_strategy_d, ALLOCATOR> hash_table_gte_17;
    179179};
  • trunk/symbol_table/symbol_table.pro

    r2043 r2045  
    1212    test/pool_test.cpp \
    1313    test/hash_test.cpp \
    14     src/main.cpp
     14    src/main.cpp \
     15    libtest/byte_compare_template.cpp \
     16    libtest/byte_compare_generator.cpp \
     17    libtest/bitscantest.cpp
    1518OTHER_FILES += marker_strms.py \
    1619    Makefile \
     
    7275    src/buffer.hpp \
    7376    lib/hash.hpp \
    74     src/gid.hpp
     77    src/gid.hpp \
     78    lib/byte_compare.hpp
  • trunk/symbol_table/symbol_table.pro.user

    r2034 r2045  
    1414  <variable>ProjectExplorer.Project.Target.0</variable>
    1515  <valuemap type="QVariantMap">
     16   <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Desktop</value>
    1617   <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
    1718   <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
    1819   <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
     20   <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>
    1921   <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
    2022   <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
    21     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
    22      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    23      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
    24      <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
     23    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
     24     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
     25      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
     26      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     27      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
     28      <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
     29      <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
     30     </valuemap>
     31     <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
     32      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
     33      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     34      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
     35      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
     36      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
     37      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
     38     </valuemap>
     39     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
     40     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
     41     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Build</value>
     42     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
    2543    </valuemap>
    26     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
    27      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    28      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    29      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
    30      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
    31      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
     44    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
     45     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
     46      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
     47      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     48      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
     49      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
     50      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
     51       <value type="QString">clean</value>
     52      </valuelist>
     53      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
     54     </valuemap>
     55     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
     56     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
     57     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Clean</value>
     58     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
    3259    </valuemap>
    33     <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
    34     <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
    35      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    36      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    37      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
    38      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
    39       <value type="QString">clean</value>
    40      </valuelist>
    41      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
    42     </valuemap>
    43     <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
     60    <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
    4461    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
    4562    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
     63    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Debug</value>
    4664    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
    4765    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     
    5371   </valuemap>
    5472   <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
    55     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
    56      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    57      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
    58      <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
     73    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
     74     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
     75      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
     76      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     77      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
     78      <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
     79      <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
     80     </valuemap>
     81     <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
     82      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
     83      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     84      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
     85      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
     86      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
     87      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
     88     </valuemap>
     89     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
     90     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
     91     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Build</value>
     92     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
    5993    </valuemap>
    60     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
    61      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    62      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    63      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
    64      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
    65      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
     94    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
     95     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
     96      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString"></value>
     97      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     98      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
     99      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
     100      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
     101      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
     102     </valuemap>
     103     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
     104     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
     105     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Clean</value>
     106     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
    66107    </valuemap>
    67     <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
    68     <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
    69      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    70      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    71      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
    72      <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
    73      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
    74     </valuemap>
    75     <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
     108    <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
    76109    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
    77110    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
     111    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Release</value>
    78112    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
    79113    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     
    85119   </valuemap>
    86120   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
     121   <valuemap key="ProjectExplorer.Target.DeployConfiguration.0" type="QVariantMap">
     122    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
     123     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">0</value>
     124     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy</value>
     125     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Deploy</value>
     126     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
     127    </valuemap>
     128    <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
     129    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">No deployment</value>
     130    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">No deployment</value>
     131    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
     132   </valuemap>
     133   <value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">1</value>
    87134   <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
     135    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">symbol_table</value>
    88136    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">symbol_table</value>
    89137    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
     
    94142    <value key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal" type="bool">false</value>
    95143    <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
    96     <value key="Qt4ProjectManager.Qt4RunConfiguration.UserSetName" type="bool">false</value>
    97144    <value key="Qt4ProjectManager.Qt4RunConfiguration.UserSetWorkingDirectory" type="bool">false</value>
    98145    <value key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory" type="QString"></value>
     146    <value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>
     147    <value key="RunConfiguration.UseCppDebugger" type="bool">true</value>
     148    <value key="RunConfiguration.UseQmlDebugger" type="bool">false</value>
    99149   </valuemap>
    100150   <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
     
    106156 </data>
    107157 <data>
     158  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
     159  <value type="QString">{3369d8a0-08d7-4ba0-929a-410d90a79a51}</value>
     160 </data>
     161 <data>
    108162  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
    109   <value type="int">4</value>
     163  <value type="int">8</value>
    110164 </data>
    111165</qtcreator>
  • trunk/symbol_table/test/hash_test.cpp

    r1973 r2045  
    1818
    1919    identity_compare k;
    20     identity_compare_t<uint32_t,4> k_t;
     20    identity_compare_t<4, uint32_t> k_t;
    2121
    2222    string X("abcd");
Note: See TracChangeset for help on using the changeset viewer.