summaryrefslogtreecommitdiff
path: root/jvmfwk/source/fwkbase.cxx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /jvmfwk/source/fwkbase.cxx
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'jvmfwk/source/fwkbase.cxx')
-rw-r--r--jvmfwk/source/fwkbase.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 226673356cd5..dbab7d4a9e7a 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -120,7 +120,7 @@ VendorSettings::VendorSettings():
VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor)
{
- assert(!sVendor.isEmpty());
+ OSL_ASSERT(!sVendor.isEmpty());
VersionInfo aVersionInfo;
OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);
//Get minVersion
@@ -436,7 +436,7 @@ JFW_MODE getMode()
OUString getApplicationClassPath()
{
- assert(getMode() == JFW_MODE_APPLICATION);
+ OSL_ASSERT(getMode() == JFW_MODE_APPLICATION);
OUString retVal;
OUString sParams = BootParams::getClasspathUrls();
if (sParams.isEmpty())
@@ -453,7 +453,7 @@ OUString getApplicationClassPath()
OUString systemPathElement;
oslFileError rc = osl_getSystemPathFromFileURL(
token.pData, &systemPathElement.pData );
- assert( rc == osl_File_E_None );
+ OSL_ASSERT( rc == osl_File_E_None );
if (rc == osl_File_E_None && !systemPathElement.isEmpty())
{
if (buf.getLength() > 0)