Changeset a4da45e for doc/LaTeXmacros/lstlang.sty

Timestamp:

Feb 26, 2024, 3:53:42 AM (21 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• doc/LaTeXmacros/lstlang.sty (modified) (2 diffs)

doc/LaTeXmacros/lstlang.sty

@@ -8 +8 @@
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Thu Sep 21 08:40:05 2023
-%% Update Count     : 31
+%% Last Modified On : Fri Feb 16 07:59:29 2024
+%% Update Count     : 37
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -125 +125 @@
 }
 
-% C++ programming language
-\lstdefinelanguage{C++}[ANSI]{C++}{
-        morekeywords={nullptr,}
-}
-
 % uC++ programming language, based on ANSI C++
-\lstdefinelanguage{uC++}[ANSI]{C++}{
+\lstdefinelanguage{uC++}[GNU]{C++}{
         morekeywords={
                 _Accept, _AcceptReturn, _AcceptWait, _Actor, _At, _Catch, _CatchResume, _CorActor, _Cormonitor, _Coroutine,