Merge remote-tracking branch 'origin/master' into windows
[scilab.git] / scilab / modules / ast / src / cpp / analysis / TIType.cpp
index 0d7d32e..10fb89a 100644 (file)
@@ -2,11 +2,14 @@
  *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  *  Copyright (C) 2015 - Scilab Enterprises - Calixte DENIZET
  *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
  *
  */
 
 
 namespace analysis
 {
-const std::string TIType::_boolean_ = "boolean",
-                          TIType::_ce_ = "ce",
-                                  TIType::_constant_ = "constant",
-                                          TIType::_fptr_ = "fptr",
-                                                  TIType::_function_ = "function",
-                                                          TIType::_int16_ = "int16",
-                                                                  TIType::_int32_ = "int32",
-                                                                          TIType::_int64_ = "int64",
-                                                                                  TIType::_int8_ = "int8",
-                                                                                          TIType::_library_ = "library",
-                                                                                                  TIType::_list_ = "list",
-                                                                                                          TIType::_mlist_ = "mlist",
-                                                                                                                  TIType::_polynomial_ = "polynomial",
-                                                                                                                          TIType::_sparse_ = "sparse",
-                                                                                                                                  TIType::_st_ = "st",
-                                                                                                                                          TIType::_string_ = "string",
-                                                                                                                                                  TIType::_tlist_ = "tlist",
-                                                                                                                                                          TIType::_uint16_ = "uint16",
-                                                                                                                                                                  TIType::_uint32_ = "uint32",
-                                                                                                                                                                          TIType::_uint64_ = "uint64",
-                                                                                                                                                                                  TIType::_uint8_ = "uint8",
-                                                                                                                                                                                          TIType::_unknown_ = "";
+const std::string   TIType::_boolean_ = "boolean",
+                    TIType::_ce_ = "ce",
+                    TIType::_constant_ = "constant",
+                    TIType::_fptr_ = "fptr",
+                    TIType::_function_ = "function",
+                    TIType::_int16_ = "int16",
+                    TIType::_int32_ = "int32",
+                    TIType::_int64_ = "int64",
+                    TIType::_int8_ = "int8",
+                    TIType::_library_ = "library",
+                    TIType::_list_ = "list",
+                    TIType::_mlist_ = "mlist",
+                    TIType::_polynomial_ = "polynomial",
+                    TIType::_sparse_ = "sparse",
+                    TIType::_st_ = "st",
+                    TIType::_string_ = "string",
+                    TIType::_tlist_ = "tlist",
+                    TIType::_uint16_ = "uint16",
+                    TIType::_uint32_ = "uint32",
+                    TIType::_uint64_ = "uint64",
+                    TIType::_uint8_ = "uint8",
+                    TIType::_unknown_ = "";
 }