← Back to branch summary

~ubuntu-branches/debian/sid/kdevelop/sid

« back to all changes in this revision

Viewing changes to languages/cpp/parser/rpp/pp-scanner.cpp

  • Committer: Package Import Robot
  • Author(s): Lisandro Damián Nicanor Pérez Meyer, Pino Toscano, Sune Vuorela, Lisandro Damián Nicanor Pérez Meyer
  • Date: 2015-09-02 21:10:24 UTC
  • mfrom: (1.3.24)
  • Revision ID: package-import@ubuntu.com-20150902211024-ntruxcyb574f3xuk
Tags: 4:4.7.1-1
* Team upload.

[ Pino Toscano ]
* Change section of kdevelop-dev to libdevel.
* Add ${misc:Depends} in kdevelop-dbg and kdevelop-l10n.

[ Sune Vuorela ]
* Make KDevelop recommend kapptemplate to have more meaningful project
  templates available.

[ Lisandro Damián Nicanor Pérez Meyer ]
* New upstream release.
  - Bump kdevplatform-dev build dependency to 1.7.1.
* Remove kde-workspace from build dependencies. We no longer provide
  a KDE 4 based workspace.
  - Add libsoprano-dev as a build dependency, it was probably previously
    pulled in by kde-workspace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
languages/cpp/parser/rpp/pp-scanner.cpp
129
129
  }
130
130
}
131
131
 
132
 
uint pp_skip_identifier::operator()(Stream& input)
 
132
uint pp_skip_identifier::operator()(Stream& input, bool multiline)
133
133
{
134
134
  KDevVarLengthArray<char, 100> identifier;
135
135
  
154
154
          ret = KDevelop::IndexedString(ret.byteArray() + KDevelop::IndexedString::fromIndex(input.current()).byteArray());
155
155
        
156
156
        ++input;
 
157
        if(multiline && input == '\\' && input.peekNextCharacter() == '\n'){
 
158
          ++input;
 
159
          ++input;
 
160
        }
157
161
      }
158
162
      return ret.index();
159
163
    }