Skip to content

Use C++17 nested declarations and add CppParser support, closes #5234 #5235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matejk merged 9 commits into from
Mar 24, 2026
Merged

Use C++17 nested declarations and add CppParser support, closes #5234 #5235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
57d3f32
Use C++17 nested declarations, closes #5234
mikomikotaishi Mar 9, 2026
3ba6402
Add inline namespace parsing to CppParser
mikomikotaishi Mar 12, 2026
59d9112
Apply recommended changes
mikomikotaishi Mar 15, 2026
8c0f57a
Merge branch 'main' into concatenate-namespace-declarations
mikomikotaishi Mar 16, 2026
713c4ef
Undo all changes made in dependencies
mikomikotaishi Mar 18, 2026
3d73131
Merge branch 'pocoproject:main' into concatenate-namespace-declarations
mikomikotaishi Mar 19, 2026
a3f451e
Check for undefined in `pushNamespace()` call
mikomikotaishi Mar 20, 2026
67069dc
Undo the last commit
mikomikotaishi Mar 20, 2026
964aa29
Merge branch 'main' into concatenate-namespace-declarations
matejk Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/CodeGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


CodeGenerator::CodeGenerator(const std::string& source, std::ostream& stream):
Expand Down Expand Up @@ -164,4 +162,4 @@ std::string CodeGenerator::fullClassName(const Class& clazz) const
}


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/CodeGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
#include <ostream>


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


class CodeGenerator
Expand Down Expand Up @@ -65,7 +63,7 @@ inline const std::string& CodeGenerator::source() const
}


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler


#endif // ActiveRecordCompiler_CodeGenerator_INCLUDED
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/Compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ using Poco::Util::HelpFormatter;
using Poco::Util::OptionCallback;


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


class CompilerApp: public Application
Expand Down Expand Up @@ -228,7 +226,7 @@ class CompilerApp: public Application
};


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler


POCO_APP_MAIN(Poco::ActiveRecord::Compiler::CompilerApp)
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/HeaderGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


HeaderGenerator::HeaderGenerator(const std::string& source, std::ostream& stream, const Class& clazz, const ClassMap& classes):
Expand Down Expand Up @@ -348,4 +346,4 @@ const Class& HeaderGenerator::referencedClass(const Property& property) const
}


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/HeaderGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
#include "Types.h"


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


class HeaderGenerator: public CodeGenerator
Expand Down Expand Up @@ -53,7 +51,7 @@ class HeaderGenerator: public CodeGenerator
};


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler


#endif // ActiveRecordCompiler_HeaderGenerator_INCLUDED
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/ImplGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


ImplGenerator::ImplGenerator(const std::string& source, std::ostream& stream, const Class& clazz, const ClassMap& classes):
Expand Down Expand Up @@ -415,4 +413,4 @@ const Class& ImplGenerator::referencedClass(const Property& property) const
}


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/ImplGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
#include "Types.h"


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


class ImplGenerator: public CodeGenerator
Expand Down Expand Up @@ -50,7 +48,7 @@ class ImplGenerator: public CodeGenerator
};


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler


#endif // ActiveRecordCompiler_ImplGenerator_INCLUDED
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/Parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


Parser::Parser()
Expand Down Expand Up @@ -274,4 +272,4 @@ std::string Parser::toDatabaseName(const std::string& name)
}


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/Parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
#include <istream>


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


class Parser: protected Poco::XML::DefaultHandler
Expand Down Expand Up @@ -57,7 +55,7 @@ class Parser: protected Poco::XML::DefaultHandler
};


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler


#endif // ActiveRecordCompiler_Parser_INCLUDED
6 changes: 2 additions & 4 deletions ActiveRecord/Compiler/src/Types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
#include <map>


namespace Poco {
namespace ActiveRecord {
namespace Compiler {
namespace Poco::ActiveRecord::Compiler {


struct Property
Expand Down Expand Up @@ -54,7 +52,7 @@ struct Class
using ClassMap = std::map<std::string, Class>;


} } } // namespace Poco::ActiveRecord::Compiler
} // namespace Poco::ActiveRecord::Compiler


#endif // ActiveRecordCompiler_Types_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
#include <limits>


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


class ActiveRecordLib_API ActiveRecordBase: public Poco::RefCountedObject
Expand Down Expand Up @@ -272,7 +271,7 @@ IDType ActiveRecord<IDType>::lastInsertID(Poco::Data::Session& session)
}


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord


#endif // ActiveRecord_ActiveRecord_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/include/Poco/ActiveRecord/Context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
#include "Poco/AutoPtr.h"


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


class ActiveRecordLib_API Context: public Poco::RefCountedObject
Expand Down Expand Up @@ -68,7 +67,7 @@ inline Poco::Data::Session& Context::session()
}


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord


#endif // ActiveRecord_Context_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/include/Poco/ActiveRecord/IDTraits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
#include "Poco/NumberFormatter.h"


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


template <typename T>
Expand Down Expand Up @@ -178,7 +177,7 @@ class IDTraits<Poco::UUID>
};


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord


#endif // ActiveRecord_IDTraits_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/include/Poco/ActiveRecord/Query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
#include "Poco/Data/Statement.h"


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


template <typename ActRec>
Expand Down Expand Up @@ -229,7 +228,7 @@ class Query
};


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord


#endif // ActiveRecord_select_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/include/Poco/ActiveRecord/StatementPlaceholderProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
#include <memory>


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


class ActiveRecordLib_API StatementPlaceholderProvider
Expand Down Expand Up @@ -56,7 +55,7 @@ class ActiveRecordLib_API PostgresStatementPlaceholderProvider: public Statement
};


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord


#endif // ActiveRecord_StatementPlaceholderProvider_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/src/ActiveRecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ using namespace Poco::Data::Keywords;
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


void ActiveRecordBase::attach(Context::Ptr pContext)
Expand Down Expand Up @@ -59,4 +58,4 @@ std::string KeylessActiveRecord::toString() const
}


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord
5 changes: 2 additions & 3 deletions ActiveRecord/src/Context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


Context::Context(const Poco::Data::Session& session):
Expand All @@ -43,4 +42,4 @@ StatementPlaceholderProvider::Ptr Context::statementPlaceholderProvider() const
}


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord
5 changes: 2 additions & 3 deletions ActiveRecord/src/IDTraits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
#include "Poco/ActiveRecord/IDTraits.h"


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


const std::string IDTraits<std::string>::INVALID_ID;
const Poco::UUID IDTraits<Poco::UUID>::INVALID_ID;


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord
5 changes: 2 additions & 3 deletions ActiveRecord/src/StatementPlaceholderProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
using namespace std::string_literals;


namespace Poco {
namespace ActiveRecord {
namespace Poco::ActiveRecord {


StatementPlaceholderProvider::~StatementPlaceholderProvider()
Expand Down Expand Up @@ -51,4 +50,4 @@ std::string PostgresStatementPlaceholderProvider::next()
}


} } // namespace Poco::ActiveRecord
} // namespace Poco::ActiveRecord
5 changes: 2 additions & 3 deletions ActiveRecord/testsuite/include/ORM/Employee.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ inline Employee& Employee::managerID(const Poco::UUID& value)
} // namespace ORM


namespace Poco {
namespace Data {
namespace Poco::Data {


template <>
Expand Down Expand Up @@ -155,7 +154,7 @@ class TypeHandler<ORM::Employee>
};


} } // namespace Poco::Data
} // namespace Poco::Data


#endif // ORM_Employee_INCLUDED
5 changes: 2 additions & 3 deletions ActiveRecord/testsuite/include/ORM/Role.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ inline Role& Role::description(const std::string& value)
} // namespace ORM


namespace Poco {
namespace Data {
namespace Poco::Data {


template <>
Expand Down Expand Up @@ -110,7 +109,7 @@ class TypeHandler<ORM::Role>
};


} } // namespace Poco::Data
} // namespace Poco::Data


#endif // ORM_Role_INCLUDED
Loading
Loading