diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /stoc/source/security | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'stoc/source/security')
| -rw-r--r-- | stoc/source/security/access_controller.cxx | 12 | ||||
| -rw-r--r-- | stoc/source/security/file_policy.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 4d173df5df02..6772d2ba2a8a 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -494,7 +494,7 @@ void AccessController::checkAndClearPostPoned() // check postponed permissions std::unique_ptr< t_rec_vec > rec( static_cast< t_rec_vec * >( m_rec.getData() ) ); m_rec.setData( nullptr ); // takeover ownership - assert( rec.get() ); + OSL_ASSERT( rec.get() ); if (rec.get()) { t_rec_vec const & vec = *rec.get(); @@ -502,20 +502,20 @@ void AccessController::checkAndClearPostPoned() { case SINGLE_USER: { - assert( m_singleUser_init ); + OSL_ASSERT( m_singleUser_init ); for (const auto & p : vec) { - assert( m_singleUserId.equals( p.first ) ); + OSL_ASSERT( m_singleUserId.equals( p.first ) ); m_singleUserPermissions.checkPermission( p.second ); } break; } case SINGLE_DEFAULT_USER: { - assert( m_defaultPerm_init ); + OSL_ASSERT( m_defaultPerm_init ); for (const auto & p : vec) { - assert( p.first.isEmpty() ); // default-user + OSL_ASSERT( p.first.isEmpty() ); // default-user m_defaultPermissions.checkPermission( p.second ); } break; @@ -530,7 +530,7 @@ void AccessController::checkAndClearPostPoned() MutexGuard guard( m_mutex ); pPermissions = m_user2permissions.lookup( p.first ); } - assert( pPermissions ); + OSL_ASSERT( pPermissions ); if (pPermissions) { pPermissions->checkPermission( p.second ); diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 948260fb119f..31bdcdbcc7c1 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -351,7 +351,7 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac ) PolicyReader::~PolicyReader() { if ( ::osl_closeFile( m_file ) != osl_File_E_None ) { - assert(false); + OSL_ASSERT( false ); } } |