Author: sebor
Date: Tue Sep 18 15:57:00 2007
New Revision: 577098
URL: http://svn.apache.org/viewvc?rev=577098&view=rev
Log:
2007-09-18 Martin Sebor <[EMAIL PROTECTED]>
* _messages.h (do_open, do_close): Outlined virtual functions
to avoid code bloat due to compiler emitting their definition
in every object file where the class is used.
* _messages.cc: Same.
Modified:
incubator/stdcxx/trunk/include/loc/_messages.cc
incubator/stdcxx/trunk/include/loc/_messages.h
Modified: incubator/stdcxx/trunk/include/loc/_messages.cc
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_messages.cc?rev=577098&r1=577097&r2=577098&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_messages.cc (original)
+++ incubator/stdcxx/trunk/include/loc/_messages.cc Tue Sep 18 15:57:00 2007
@@ -6,22 +6,23 @@
*
***************************************************************************
*
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at
*
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -33,6 +34,25 @@
template <class _CharT>
_RW::__rw_facet_id messages<_CharT>::id;
+
+
+template <class _CharT>
+_TYPENAME messages<_CharT>::catalog
+messages<_CharT>::
+do_open (const string& __fun, const locale&__loc) const
+{
+ return _RW::__rw_cat_open (__fun, __loc);
+}
+
+
+template <class _CharT>
+void
+messages<_CharT>::
+do_close (catalog __cat) const
+{
+ _RW::__rw_cat_close (__cat);
+}
+
template <class _CharT>
_TYPENAME messages<_CharT>::string_type
Modified: incubator/stdcxx/trunk/include/loc/_messages.h
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/loc/_messages.h?rev=577098&r1=577097&r2=577098&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/loc/_messages.h (original)
+++ incubator/stdcxx/trunk/include/loc/_messages.h Tue Sep 18 15:57:00 2007
@@ -25,7 +25,7 @@
* implied. See the License for the specific language governing
* permissions and limitations under the License.
*
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
*
**************************************************************************/
@@ -106,15 +106,11 @@
protected:
- virtual catalog do_open (const string& __fun, const locale&__loc) const {
- return _RW::__rw_cat_open (__fun, __loc);
- }
+ virtual catalog do_open (const string&, const locale&) const;
virtual string_type do_get (catalog, int, int, const string_type&) const;
- virtual void do_close (catalog __cat) const {
- _RW::__rw_cat_close (__cat);
- }
+ virtual void do_close (catalog) const;
};