stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r386898 - in /incubator/stdcxx/trunk/tests: include/localedef.h include/rw_locale.h src/locale.cpp src/localedef.cpp
Date Sat, 18 Mar 2006 22:59:02 GMT
Author: sebor
Date: Sat Mar 18 14:59:00 2006
New Revision: 386898

URL: http://svn.apache.org/viewcvs?rev=386898&view=rev
Log:
2006-03-18  Martin Sebor  <sebor@roguewave.com>

	* localedef.h: Renamed...
	* rw_locale.h: ...to this to prevent clashing with the HP-UX
	system header with the same name.
	* localedef.cpp: Renamed...
	* locale.cpp: ...to this to (pretty closely) match header name.

Added:
    incubator/stdcxx/trunk/tests/include/rw_locale.h
      - copied, changed from r386144, incubator/stdcxx/trunk/tests/include/localedef.h
    incubator/stdcxx/trunk/tests/src/locale.cpp
      - copied, changed from r386144, incubator/stdcxx/trunk/tests/src/localedef.cpp
Removed:
    incubator/stdcxx/trunk/tests/include/localedef.h
    incubator/stdcxx/trunk/tests/src/localedef.cpp

Copied: incubator/stdcxx/trunk/tests/include/rw_locale.h (from r386144, incubator/stdcxx/trunk/tests/include/localedef.h)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/include/rw_locale.h?p2=incubator/stdcxx/trunk/tests/include/rw_locale.h&p1=incubator/stdcxx/trunk/tests/include/localedef.h&r1=386144&r2=386898&rev=386898&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/include/localedef.h (original)
+++ incubator/stdcxx/trunk/tests/include/rw_locale.h Sat Mar 18 14:59:00 2006
@@ -6,21 +6,27 @@
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. 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.    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.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
  *
+ * 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
+ *
+ * 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.
+ * 
  **************************************************************************/
 
-#ifndef RW_LOCALEDEF_H_INCLUDED
-#define RW_LOCALEDEF_H_INCLUDED
+#ifndef RW_LOCALE_H_INCLUDED
+#define RW_LOCALE_H_INCLUDED
 
 
 #include <testdefs.h>
@@ -58,4 +64,4 @@
 rw_localedef (const char*, const char*, const char*, const char*);
 
 
-#endif   // RW_LOCALEDEF_H_INCLUDED
+#endif   // RW_LOCALE_H_INCLUDED

Copied: incubator/stdcxx/trunk/tests/src/locale.cpp (from r386144, incubator/stdcxx/trunk/tests/src/localedef.cpp)
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/src/locale.cpp?p2=incubator/stdcxx/trunk/tests/src/locale.cpp&p1=incubator/stdcxx/trunk/tests/src/localedef.cpp&r1=386144&r2=386898&rev=386898&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/src/localedef.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/locale.cpp Sat Mar 18 14:59:00 2006
@@ -1,21 +1,27 @@
 /************************************************************************
  *
- * localedef.cpp - definitions of locale helpers
+ * locale.cpp - definitions of locale helpers
  *
- * $Id:$
+ * $Id$
  *
  ************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. 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.    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.
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * 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
+ *
+ * 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.
  * 
  **************************************************************************/
 
@@ -23,14 +29,7 @@
 #define _RWSTD_TEST_SRC
 
 
-#ifdef _RWSTD_USE_CONFIG
-   // FIXME: use one style of #include paths consistently throughout
-   // the whole test suite (this form prevents #including the HP-UX
-   // /usr/include/localedef.h header)
-#  include "../include/localedef.h"
-#else
-#  include <localedef.h>
-#endif
+#include <rw_locale.h>
 
 #include <environ.h>    // for rw_putenv()
 #include <file.h>       // for SHELL_RM_RF, rw_tmpnam



Mime
View raw message