generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 18:22:59 +02:00
Code Issues Projects Releases Wiki Activity

merge fixes from develop

Browse Source
This commit is contained in:
Günter Obiltschnig
2018-12-30 21:16:19 +01:00
parent 19228eedd9
commit b543e074a1
9 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CppParser/include/Poco/CppParser/CppParser.h
View File

@@ -28,7 +28,7 @@
// from a DLL simpler. All files within this DLL are compiled with the CppParser_EXPORTS
// symbol defined on the command line. this symbol should not be defined on any project
// that uses this DLL. This way any other project whose source files include this file see
// CppParser_API functions as being imported from a DLL, wheras this DLL sees symbols
// CppParser_API functions as being imported from a DLL, whereas this DLL sees symbols
// defined with this macro as being exported.
//
#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(POCO_DLL)

1
CppParser/include/Poco/CppParser/CppToken.h
View File

@@ -244,7 +244,6 @@ public:
Poco::Token::Class tokenClass() const;
bool start(char c, std::istream& istr);
void finish(std::istream& istr);
int asInteger() const;
double asFloat() const;

4
CppParser/include/Poco/CppParser/NameSpace.h
View File

@@ -64,7 +64,7 @@ public:
Symbol* lookup(const std::string& name) const;
/// Looks up the given name in the symbol table
/// and returns the corresponsing symbol, or null
/// and returns the corresponding symbol, or null
/// if no symbol can be found. The name can include
/// a namespace.
@@ -102,7 +102,7 @@ public:
private:
Symbol* lookup(const std::string& name, std::set<const NameSpace*>& alreadyVisited) const;
/// Looks up the given name in the symbol table
/// and returns the corresponsing symbol, or null
/// and returns the corresponding symbol, or null
/// if no symbol can be found. The name can include
/// a namespace.