ICU-62123.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / indiancal.cpp

diff --git a/icuSources/i18n/indiancal.cpp b/icuSources/i18n/indiancal.cpp
index 6563a4f16a038bf7e0faddc6e1fc772a67dbb62b..278f9efb2e03f86657dda280aee2232dba5cb877 100644 (file)
--- a/icuSources/i18n/indiancal.cpp
+++ b/icuSources/i18n/indiancal.cpp
@@ -1,5 +1,7 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 /*

- * Copyright (C) 2003-2008, International Business Machines Corporation
+ * Copyright (C) 2003-2014, International Business Machines Corporation

  * and others. All Rights Reserved.
  ******************************************************************************
  *
  * and others. All Rights Reserved.
  ******************************************************************************
  *


@@ -16,7 +18,6 @@
 #include "gregoimp.h" // Math
 #include "astro.h" // CalendarAstronomer
 #include "uhash.h"
 #include "gregoimp.h" // Math
 #include "astro.h" // CalendarAstronomer
 #include "uhash.h"

-#include "ucln_in.h"

 
 // Debugging
 #ifdef U_DEBUG_INDIANCAL
 
 // Debugging
 #ifdef U_DEBUG_INDIANCAL


@@ -110,7 +111,7 @@ static UBool isGregorianLeap(int32_t year)
  */
 int32_t IndianCalendar::handleGetMonthLength(int32_t eyear, int32_t month) const {
    if (month < 0 || month > 11) {
  */
 int32_t IndianCalendar::handleGetMonthLength(int32_t eyear, int32_t month) const {
    if (month < 0 || month > 11) {

-      eyear += Math::floorDivide(month, 12, month);
+      eyear += ClockMath::floorDivide(month, 12, month);

    }
 
    if (isGregorianLeap(eyear + INDIAN_ERA_START) && month == 0) {
    }
 
    if (isGregorianLeap(eyear + INDIAN_ERA_START) && month == 0) {


@@ -237,14 +238,14 @@ static double IndianToJD(int32_t year, int32_t month, int32_t date) {
  * @param eyear The year in Indian Calendar measured from Saka Era (78 AD).
  * @param month The month in Indian calendar
  */
  * @param eyear The year in Indian Calendar measured from Saka Era (78 AD).
  * @param month The month in Indian calendar
  */

-int32_t IndianCalendar::handleComputeMonthStart(int32_t eyear, int32_t month, UBool useMonth) const {
+int32_t IndianCalendar::handleComputeMonthStart(int32_t eyear, int32_t month, UBool /* useMonth */ ) const {

 
    //month is 0 based; converting it to 1-based 
    int32_t imonth;
 
     // If the month is out of range, adjust it into range, and adjust the extended eyar accordingly
    if (month < 0 || month > 11) {
 
    //month is 0 based; converting it to 1-based 
    int32_t imonth;
 
     // If the month is out of range, adjust it into range, and adjust the extended eyar accordingly
    if (month < 0 || month > 11) {

-      eyear += (int32_t)Math::floorDivide(month, 12, month);
+      eyear += (int32_t)ClockMath::floorDivide(month, 12, month);

    }
 
    if(month == 12){
    }
 
    if(month == 12){


@@ -288,7 +289,7 @@ int32_t IndianCalendar::handleGetExtendedYear() {
  * method is called. The getGregorianXxx() methods return Gregorian
  * calendar equivalents for the given Julian day.
  */
  * method is called. The getGregorianXxx() methods return Gregorian
  * calendar equivalents for the given Julian day.
  */

-void IndianCalendar::handleComputeFields(int32_t julianDay, UErrorCode& status) {
+void IndianCalendar::handleComputeFields(int32_t julianDay, UErrorCode&  /* status */) {

     double jdAtStartOfGregYear;
     int32_t leapMonth, IndianYear, yday, IndianMonth, IndianDayOfMonth, mday;
     int32_t gregorianYear;      // Stores gregorian date corresponding to Julian day;
     double jdAtStartOfGregYear;
     int32_t leapMonth, IndianYear, yday, IndianMonth, IndianDayOfMonth, mday;
     int32_t gregorianYear;      // Stores gregorian date corresponding to Julian day;